Merge "More sonar issues in common"

1 files changed, 11 insertions, 9 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);
+                }
             }
-
         }
     }