Changeset 18665 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2023-02-16T16:01:49+01:00 (23 months ago)

Author:

taylor.smock

Message:

Fix several coverity issues

CID-1504572: Synchronization on java.util.concurrent objects

The lock wasn't necessary after moving from AtomicBoolean to
CountDownLatch

CID-1504570: Dereference null value -- the default getApiUrl return was null
CID-1504570: Explicit null dereferenced

Consumer<IOAuthToken> to Consumer<Optional<IOAuthToken>>

CID-1476014, CID-1476013, CID-1476011: Resource leak

These resource leaks are unlikely to happen outside of plugin code,
and are all related to StringSelection#getTransferData, which may
return a Closeable object, but is unlikely to be the Transferable
for any of the affected classes.

This also fixes some recently introduced SonarLint issues. It also suppresses
squid:S100 ("Method names should comply with a naming convention") for the MapCSS
Functions class, since the convention for that method names in that class is
^[a-zA-Z][a-zA-Z0-9_]*$

File:

• trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/OsmConnection.java

@@ -11 +11 @@
 import java.util.Base64;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -215 +216 @@
         }
         CountDownLatch done = new CountDownLatch(1);
-        Consumer<IOAuthToken> consumer = authToken -> {
+        Consumer<Optional<IOAuthToken>> consumer = authToken -> {
                     if (!remoteControlIsRunning) {
                         RemoteControl.stop();
@@ -221 +222 @@
                     // Clean up old token/password
                     OAuthAccessTokenHolder.getInstance().setAccessToken(null);
-                    OAuthAccessTokenHolder.getInstance().setAccessToken(OsmApi.getOsmApi().getServerUrl(), authToken);
+                    OAuthAccessTokenHolder.getInstance().setAccessToken(OsmApi.getOsmApi().getServerUrl(), authToken.orElse(null));
                     OAuthAccessTokenHolder.getInstance().save(CredentialsManager.getInstance());
                     done.countDown();
@@ -229 +230 @@
                 OsmScopes.read_prefs, OsmScopes.write_prefs,
                 OsmScopes.write_api, OsmScopes.write_notes);
-        synchronized (done) {
-            // Only wait at most 5 minutes
-            int counter = 0;
-            while (done.getCount() >= 0 && counter < 5) {
-                try {
-                    if (done.await(1, TimeUnit.MINUTES)) {
-                        break;
-                    }
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    Logging.trace(e);
-                    consumer.accept(null);
-                    throw new MissingOAuthAccessTokenException(e);
+        // Only wait at most 5 minutes
+        int counter = 0;
+        while (done.getCount() >= 0 && counter < 5) {
+            try {
+                if (done.await(1, TimeUnit.MINUTES)) {
+                    break;
                 }
-                counter++;
-            }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                Logging.trace(e);
+                consumer.accept(null);
+                throw new MissingOAuthAccessTokenException(e);
+            }
+            counter++;
         }
     }