svn commit: r1813671 - /ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java

Author: jleroux
Date: Sun Oct 29 08:16:58 2017
New Revision: 1813671

URL: http://svn.apache.org/viewvc?rev=1813671&view=rev
Log:
No functional change.

While reviewing r1813634, I found that we could use a multi-catch, and while
doing so found that we were missing a CertificateException according to Eclipse

Confirmed by Java:
:compileJava
ofbiz\framework\service\src\main\java\org\apache\ofbiz\service\rmi\socket\ssl\
SSLServerSocketFactory.java:75: error:
unreported exception CertificateException; must be caught or declared to be
thrown
                ks.load(fis, passphrase);

Modified:
    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/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=1813671&r1=1813670&r2=1813671&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 Sun Oct 29 08:16:58 2017
@@ -74,13 +74,7 @@ public class SSLServerSocketFactory impl
             try (FileInputStream fis = new FileInputStream(keystore)) {
                 ks = KeyStore.getInstance(ksType);
                 ks.load(fis, passphrase);
-            } catch (NoSuchAlgorithmException e) {
-                Debug.logError(e, module);
-                throw new IOException(e.getMessage());
-            } catch (CertificateException e) {
-                Debug.logError(e, module);
-                throw new IOException(e.getMessage());
-            } catch (KeyStoreException e) {
+            } catch (NoSuchAlgorithmException | IOException | KeyStoreException | CertificateException e) {
                 Debug.logError(e, module);
                 throw new IOException(e.getMessage());
             }