You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mb...@apache.org on 2017/12/16 18:55:57 UTC
svn commit: r1818444 - in /ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl: SSLClientSocketFactory.java SSLServerSocketFactory.java

Author: mbrohl
Date: Sat Dec 16 18:55:57 2017
New Revision: 1818444

URL: http://svn.apache.org/viewvc?rev=1818444&view=rev
Log:
Improved: General refactoring and code improvements, package 
org.apache.ofbiz.service.rmi.socket.ssl.
(OFBIZ-9959)

Thanks Dennis Balkir for reporting and providing the patches.

Modified:
    ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java
    ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java

Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java?rev=1818444&r1=1818443&r2=1818444&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java Sat Dec 16 18:55:57 2017
@@ -43,11 +43,9 @@ public class SSLClientSocketFactory impl
         try {
             SSLSocketFactory factory = SSLUtil.getSSLSocketFactory();
             return factory.createSocket(host, port);
-        } catch (GeneralSecurityException e) {
+        } catch (GeneralSecurityException | GenericConfigException e) {
             Debug.logError(e, module);
             throw new IOException(e.getMessage());
-        } catch (GenericConfigException e) {
-            throw new IOException(e.getMessage());
         }
     }
 }

Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java?rev=1818444&r1=1818443&r2=1818444&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java Sat Dec 16 18:55:57 2017
@@ -91,11 +91,9 @@ public class SSLServerSocketFactory impl
             } else {
                 factory = SSLUtil.getSSLServerSocketFactory(alias);
             }
-        } catch (GeneralSecurityException e) {
+        } catch (GeneralSecurityException | GenericConfigException e) {
             Debug.logError(e, "Error getting javax.net.ssl.SSLServerSocketFactory instance for Service Engine RMI calls: " + e.toString(), module);
             throw new IOException(e.toString());
-        } catch (GenericConfigException e) {
-            Debug.logError(e, "Error getting javax.net.ssl.SSLServerSocketFactory instance for Service Engine RMI calls: " + e.toString(), module);
         }
 
         if (factory == null) {