Merge pull request #672 from hussainnm/fix-npe

#625 Resolve NullPointerException
jakartaee · Mar 18, 2021 · 912de88 · 912de88
2 parents ba30c81 + 28fdf60
commit 912de88
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/com/sun/ts/lib/deliverable/cts/CTSPropertyManager.java b/src/com/sun/ts/lib/deliverable/cts/CTSPropertyManager.java
@@ -353,8 +353,11 @@ public Properties getTestSpecificProperties(String[] sPropKeys)
     pTestProps.put("securedWebServicePort",
         getProperty("securedWebServicePort"));
     pTestProps.put("webServerPort", getProperty("webServerPort"));
-    pTestProps.put("client.cert.test.jdk.tls.client.protocols", 
-        getProperty("client.cert.test.jdk.tls.client.protocols", null));
+
+    String sTlsClientProtocols = getProperty("client.cert.test.jdk.tls.client.protocols", null);
+    if (sTlsClientProtocols != null) {
+        pTestProps.put("client.cert.test.jdk.tls.client.protocols", sTlsClientProtocols);
+    }
 
     // add properties used for JPA 2.2 tests.
     pTestProps.put("persistence.unit.name",

diff --git a/src/com/sun/ts/lib/deliverable/servlet/ServletPropertyManager.java b/src/com/sun/ts/lib/deliverable/servlet/ServletPropertyManager.java
@@ -83,8 +83,11 @@ public Properties getTestSpecificProperties(String[] sPropKeys)
         getProperty("porting.ts.url.class.1"));
     pTestProps.put("porting.ts.HttpsURLConnection.class.1",
         getProperty("porting.ts.HttpsURLConnection.class.1", null));
-    pTestProps.put("client.cert.test.jdk.tls.client.protocols",
-        getProperty("client.cert.test.jdk.tls.client.protocols", null));
+
+	String sTlsClientProtocol = getProperty("client.cert.test.jdk.tls.client.protocols", null);
+	if (sTlsClientProtocol != null) {
+        pTestProps.put("client.cert.test.jdk.tls.client.protocols", sTlsClientProtocol);
+    }
 
     String tsHome = getProperty("TS_HOME", null);
     if (tsHome == null)