Changeset 5874 in josm for trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

Timestamp:

2013-04-16T19:57:43+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8570, #7406 - I/O refactorization:

• Move different file copy functions to Utils.copyFile (to be replaced later by Files.copy when switching to Java 7)
• Replace all Utils.close(XXX) by Utils.close(Closeable) -> impacted plugins: commandline, mirrored_download, opendata, piclayer
• Add new Utils.close(ZipFile)
• Use of Utils.close almost everywhere
• Javadoc fixes

File:

• trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -405 +405 @@
             dout.writeBytes(request);
             dout.flush();
-            dout.close();
+            Utils.close(dout);
 
             // after a successful login the OSM website sends a redirect to a follow up page. Everything
@@ -419 +419 @@
             throw new OsmLoginFailedException(e);
         } finally {
-            if (dout != null) {
-                try {
-                    dout.close();
-                } catch(IOException e) { /* ignore */ }
-            }
+            Utils.close(dout);
             synchronized(this) {
                 connection = null;
@@ -496 +492 @@
             dout.writeBytes(request);
             dout.flush();
-            dout.close();
 
             int retCode = connection.getResponseCode();
@@ -506 +501 @@
             throw new OsmOAuthAuthorizationException(e);
         } finally {
-            if (dout != null) {
-                try {
-                    dout.close();
-                } catch(IOException e) { /* ignore */ }
-            }
+            Utils.close(dout);
             synchronized(this) {
                 connection = null;