Changeset 11312 in josm

Timestamp:

2016-11-26T00:18:56+01:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - OS_OPEN_STREAM

File:

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

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

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.math.BigInteger;
 import java.net.ServerSocket;
@@ -237 +238 @@
 
             ks.setKeyEntry(ENTRY_ALIAS, pair.getPrivate(), entryPassword, new Certificate[]{cert});
-            ks.store(Files.newOutputStream(path, StandardOpenOption.CREATE), storePassword);
+            try (OutputStream out = Files.newOutputStream(path, StandardOpenOption.CREATE)) {
+                ks.store(out, storePassword);
+            }
         }
         return path;
@@ -381 +384 @@
             RemoteControl.getInet6Address() : RemoteControl.getInet4Address());
 
-        if (Main.isTraceEnabled()) {
-            if (server instanceof SSLServerSocket) {
-                SSLServerSocket sslServer = (SSLServerSocket) server;
-                Main.trace("SSL server - Enabled Cipher suites: "+Arrays.toString(sslServer.getEnabledCipherSuites()));
-                Main.trace("SSL server - Enabled Protocols: "+Arrays.toString(sslServer.getEnabledProtocols()));
-                Main.trace("SSL server - Enable Session Creation: "+sslServer.getEnableSessionCreation());
-                Main.trace("SSL server - Need Client Auth: "+sslServer.getNeedClientAuth());
-                Main.trace("SSL server - Want Client Auth: "+sslServer.getWantClientAuth());
-                Main.trace("SSL server - Use Client Mode: "+sslServer.getUseClientMode());
-            }
+        if (Main.isTraceEnabled() && server instanceof SSLServerSocket) {
+            SSLServerSocket sslServer = (SSLServerSocket) server;
+            Main.trace("SSL server - Enabled Cipher suites: "+Arrays.toString(sslServer.getEnabledCipherSuites()));
+            Main.trace("SSL server - Enabled Protocols: "+Arrays.toString(sslServer.getEnabledProtocols()));
+            Main.trace("SSL server - Enable Session Creation: "+sslServer.getEnableSessionCreation());
+            Main.trace("SSL server - Need Client Auth: "+sslServer.getNeedClientAuth());
+            Main.trace("SSL server - Want Client Auth: "+sslServer.getWantClientAuth());
+            Main.trace("SSL server - Use Client Mode: "+sslServer.getUseClientMode());
         }
     }