Changeset 7033 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

Timestamp:

2014-05-01T02:34:43+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - global use of try-with-resources, according to

• ​http://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html
• ​https://blogs.oracle.com/darcy/entry/project_coin_null_try_with

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

@@ -56 +56 @@
                 
                 // Load keystore
-                InputStream in = RemoteControlHttpsServer.class.getResourceAsStream(KEYSTORE_PATH);
-                if (in == null) {
-                    Main.error(tr("Unable to find JOSM keystore at {0}. Remote control will not be available on HTTPS.", KEYSTORE_PATH));
-                } else {
-                    try {
-                        ks.load(in, password);
-                    } finally {
-                        Utils.close(in);
+                try (InputStream in = RemoteControlHttpsServer.class.getResourceAsStream(KEYSTORE_PATH)) {
+                    if (in == null) {
+                        Main.error(tr("Unable to find JOSM keystore at {0}. Remote control will not be available on HTTPS.", KEYSTORE_PATH));
+                    } else {
+                        try {
+                            ks.load(in, password);
+                        } finally {
+                            Utils.close(in);
+                        }
+                        
+                        if (Main.isDebugEnabled()) {
+                            for (Enumeration<String> aliases = ks.aliases(); aliases.hasMoreElements();) {
+                                Main.debug("Alias in keystore: "+aliases.nextElement());
+                            }
+                        }
+    
+                        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+                        kmf.init(ks, password);
+                        
+                        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
+                        tmf.init(ks);
+                        
+                        sslContext = SSLContext.getInstance("TLS");
+                        sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+                        
+                        if (Main.isDebugEnabled()) {
+                            Main.debug("SSL Context protocol: " + sslContext.getProtocol());
+                            Main.debug("SSL Context provider: " + sslContext.getProvider());
+                        }
+                        
+                        initOK = true;
                     }
-                    
-                    if (Main.isDebugEnabled()) {
-                        for (Enumeration<String> aliases = ks.aliases(); aliases.hasMoreElements();) {
-                            Main.debug("Alias in keystore: "+aliases.nextElement());
-                        }
-                    }
-
-                    KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-                    kmf.init(ks, password);
-                    
-                    TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-                    tmf.init(ks);
-                    
-                    sslContext = SSLContext.getInstance("TLS");
-                    sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-                    
-                    if (Main.isDebugEnabled()) {
-                        Main.debug("SSL Context protocol: " + sslContext.getProtocol());
-                        Main.debug("SSL Context provider: " + sslContext.getProvider());
-                    }
-                    
-                    initOK = true;
                 }
             } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException | 
@@ -175 +176 @@
              Integer.toString(server.getLocalPort()));
         while (true) {
-            try {
-                Socket request = server.accept();
+            try (Socket request = server.accept()) {
                 if (Main.isDebugEnabled() && request instanceof SSLSocket) {
                     SSLSocket sslSocket = (SSLSocket) request;