Merge "More sonar issues in common"

3 files changed, 27 insertions, 16 deletions

diff --git a/integrity-audit/src/main/java/org/onap/policy/common/ia/AuditThread.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/AuditThread.java
index 25335540..accef643 100644
--- a/integrity-audit/src/main/java/org/onap/policy/common/ia/AuditThread.java
+++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/AuditThread.java
@@ -169,7 +169,9 @@ public class AuditThread extends Thread {
         IntegrityAuditEntity thisEntity;
         integrityAudit.setThreadInitialized(true); // An exception will set it to false
 
-        while (true) {
+        boolean interrupted = false;
+
+        while (!interrupted) {
             try {
                 /*
                  * It may have been awhile since we last cycled through this loop, so refresh
@@ -208,16 +210,16 @@ public class AuditThread extends Thread {
                 if (isInterruptedException(e)) {
                     String msg = "AuditThread.run loop - Exception thrown: " + e.getMessage() + "; Stopping.";
                     logger.error(MessageCodes.EXCEPTION_ERROR, e, msg);
-                    break;
-                }
+                    interrupted = true;
 
-                String msg = "AuditThread.run loop - Exception thrown: " + e.getMessage()
-                        + "; Will try audit again in " + integrityAuditPeriodSeconds + " seconds";
-                logger.error(MessageCodes.EXCEPTION_ERROR, e, msg);
-                // Sleep and try again later
-                AuditorTime.getInstance().sleep(integrityAuditPeriodSeconds * 1000L);
+                } else {
+                    String msg = "AuditThread.run loop - Exception thrown: " + e.getMessage()
+                                    + "; Will try audit again in " + integrityAuditPeriodSeconds + " seconds";
+                    logger.error(MessageCodes.EXCEPTION_ERROR, e, msg);
+                    // Sleep and try again later
+                    AuditorTime.getInstance().sleep(integrityAuditPeriodSeconds * 1000L);
+                }
             }
-
         }
     }
 
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java
index f7f2fc15..6825f07c 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java
@@ -115,7 +115,7 @@ public abstract class JettyServletServer implements HttpServletServer, Runnable
     /**
      * Jetty thread.
      */
-    protected volatile Thread jettyThread;
+    protected Thread jettyThread;
 
     /**
      * Start condition.
@@ -418,12 +418,13 @@ public abstract class JettyServletServer implements HttpServletServer, Runnable
 
         this.stop();
 
-        if (this.jettyThread == null) {
-            return;
+        Thread jettyThreadCopy;
+        synchronized (this) {
+            if ((jettyThreadCopy = this.jettyThread) == null) {
+                return;
+            }
         }
 
-        Thread jettyThreadCopy = this.jettyThread;
-
         if (jettyThreadCopy.isAlive()) {
             try {
                 jettyThreadCopy.join(2000L);
diff --git a/utils/src/main/java/org/onap/policy/common/utils/network/NetworkUtil.java b/utils/src/main/java/org/onap/policy/common/utils/network/NetworkUtil.java
index 14362627..9a3d455b 100644
--- a/utils/src/main/java/org/onap/policy/common/utils/network/NetworkUtil.java
+++ b/utils/src/main/java/org/onap/policy/common/utils/network/NetworkUtil.java
@@ -105,7 +105,11 @@ public class NetworkUtil {
      * @throws IOException if a socket cannot be created
      */
     public static int allocPort(InetSocketAddress hostAddr) throws IOException {
-        try (ServerSocket socket = new ServerSocket()) {
+        /*
+         * The socket is only used to find an unused address for a new server. As a
+         * result, it poses no security risk, thus the sonar issue can be ignored.
+         */
+        try (ServerSocket socket = new ServerSocket()) {    // NOSONAR
             socket.bind(hostAddr);
 
             return socket.getLocalPort();
@@ -134,7 +138,11 @@ public class NetworkUtil {
             throws InterruptedException {
         int retry = 0;
         while (retry < retries) {
-            try (Socket s = new Socket(host, port)) {
+            /*
+             * As with the server socket, this is only used to see if the port is open,
+             * thus the sonar issue can be ignored.
+             */
+            try (Socket s = new Socket(host, port)) {   // NOSONAR
                 logger.debug("{}:{} connected - retries={} interval={}", host, port, retries, interval);
                 return true;
             } catch (final IOException e) {