Java 6 and 7 compatibility fix (#55) (#56)

* Fix using a Java 8 method call to retain 1.6 compatibility

* Enhance documentation around managing certificates.

* Release notes for 2.4.2

* Version bump

Bundle/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.sf.openas2</groupId>
         <artifactId>OpenAS2</artifactId>
-        <version>2.4.1</version>
+        <version>2.4.2</version>
     </parent>
 
     <artifactId>openas2-osgi</artifactId>

RELEASE-NOTES.txt

@@ -1,18 +1,18 @@
               OpenAS2 Server
-              Version 2.4.1
+              Version 2.4.2
               RELEASE NOTES
 
-The OpenAS2 project is pleased to announce the release of OpenAS2 2.4.1
+The OpenAS2 project is pleased to announce the release of OpenAS2 2.4.2
 
-The release download file is: OpenAS2Server-2.4.1.zip
+The release download file is: OpenAS2Server-2.4.2.zip
 The zip file contains a PDF document providing information on installing and using the application.
 
-Version 2.4.1 - 2017-09-28
-This is a minor enhancement release:
+Version 2.4.2 - 2017-10-12
+This is a minor bugfix and documentation enhancement release:
        IMPORTANT NOTE: Please review upgrade notes below if you are upgrading
 
-  1. Enhance health check module to test all active modules. All modules now require implementing a healthcheck() method for self test.
-
+  1. Fix using a Java 1.8 call to ensure 1.6 compatibility
+  2. Enhance documentation around certifcate creation and deployment. 
 
 Upgrade Notes
  See the openAS2HowTo appendix for the general process on upgrading OpenAS2.

Remote/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.sf.openas2</groupId>
         <artifactId>OpenAS2</artifactId>
-        <version>2.4.1</version>
+        <version>2.4.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.sf.openas2</groupId>
         <artifactId>OpenAS2</artifactId>
-        <version>2.4.1</version>
+        <version>2.4.2</version>
     </parent>
 
     <artifactId>openas2-server</artifactId>

Server/src/main/java/org/openas2/processor/msgtracking/EmbeddedDBHandler.java

@@ -40,8 +40,10 @@ public void start(String connectString, String userName, String pwd, Map<String,
 		createConnectionPool(connectString, userName, pwd);
 		if ("true".equalsIgnoreCase(getParameter(PARAM_TCP_SERVER_START, "true")))
 		{
-			String tcpPort = params.getOrDefault(PARAM_TCP_SERVER_PORT, "9092");
-			String tcpPwd = params.getOrDefault(PARAM_TCP_SERVER_PWD, "OpenAS2");
+			String tcpPort = params.get(PARAM_TCP_SERVER_PORT);
+			if (tcpPort == null || tcpPort.length() < 1) tcpPort = "9092";
+			String tcpPwd = params.get(PARAM_TCP_SERVER_PWD);
+			if (tcpPwd == null || tcpPwd.length() < 1) tcpPwd = "OpenAS2";
 			String dbDirectory = params.get(PARAM_DB_DIRECTORY);
 			if (dbDirectory == null || dbDirectory.length() < 1)
 				throw new OpenAS2Exception("TCP server requireds parameter: " + PARAM_DB_DIRECTORY);

changes.txt

@@ -1,3 +1,10 @@
+Version 2.4.2 - 2017-10-12
+This is a minor bugfix and documentation enhancement release:
+       IMPORTANT NOTE: Please review upgrade notes below if you are upgrading
+
+  1. Fix using a Java 1.8 call to ensure 1.6 compatibility
+  2. Enhance documentation around certifcate creation and deployment.
+
 Version 2.4.1 - 2017-09-28
 This is a minor enhancement release:
        IMPORTANT NOTE: Please review upgrade notes below if you are upgrading

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.sf.openas2</groupId>
 	<artifactId>OpenAS2</artifactId>
-	<version>2.4.1</version>
+	<version>2.4.2</version>
 	<name>OpenAS2</name>
 	<packaging>pom</packaging>