Restore interrupted state

Issue-ID: AAI-1399
Change-Id: If5f560ae721143b2b7286edd10b48ac009a181a8
Signed-off-by: bogumil_zebek <bogumil.zebek@nokia.com>

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/aggregation/sync/HistoricalEntitySummarizer.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/aggregation/sync/HistoricalEntitySummarizer.java
index a41df4f..c6cd3b1 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/aggregation/sync/HistoricalEntitySummarizer.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/aggregation/sync/HistoricalEntitySummarizer.java
@@ -76,7 +76,6 @@ public class HistoricalEntitySummarizer extends AbstractEntitySynchronizer
   /**
    * Instantiates a new historical entity summarizer.
    *
-   * @param indexName the index name
    * @throws Exception the exception
    */
   public HistoricalEntitySummarizer(ElasticSearchSchemaConfig schemaConfig, int internalSyncWorkers,
@@ -304,6 +303,7 @@ public class HistoricalEntitySummarizer extends AbstractEntitySynchronizer
         Thread.sleep(500);
       } catch (InterruptedException exc) {
         LOG.error(AaiUiMsgs.INTERRUPTED, "historical Entities", exc.getMessage());
+        Thread.currentThread().interrupt();
       }
     }
 

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/ActiveInventoryAdapter.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/ActiveInventoryAdapter.java
index 214538f..33d2ff4 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/ActiveInventoryAdapter.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/ActiveInventoryAdapter.java
@@ -360,6 +360,7 @@ public class ActiveInventoryAdapter {
         Thread.sleep(50);
       } catch (InterruptedException exc) {
         LOG.error(AaiUiMsgs.QUERY_AAI_WAIT_INTERRUPTION, exc.getLocalizedMessage());
+        Thread.currentThread().interrupt();
         break;
       }
       LOG.error(AaiUiMsgs.QUERY_AAI_RETRY_FAILURE_WITH_SEQ, url, String.valueOf(retryCount + 1));

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/GizmoAdapter.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/GizmoAdapter.java
index 86573d2..a888c8b 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/GizmoAdapter.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/GizmoAdapter.java
@@ -238,6 +238,7 @@ public class GizmoAdapter {
                                Thread.sleep(50);
                        } catch (InterruptedException exc) {
                                LOG.error(AaiUiMsgs.QUERY_AAI_WAIT_INTERRUPTION, exc.getLocalizedMessage());
+                               Thread.currentThread().interrupt();
                                break;
                        }
                        LOG.error(AaiUiMsgs.QUERY_AAI_RETRY_FAILURE_WITH_SEQ, url, String.valueOf(retryCount + 1));

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/SyncControllerImpl.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/SyncControllerImpl.java
index 397e2fe..8b008de 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/SyncControllerImpl.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/SyncControllerImpl.java
@@ -626,6 +626,7 @@ public class SyncControllerImpl implements SyncController {
       } catch (InterruptedException exc) {
         LOG.error(AaiUiMsgs.ERROR_GENERIC,
             "An error occurred while waiting for sync to complete. Error = " + exc.getMessage());
+        Thread.currentThread().interrupt();
       }
 
     }

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/task/SyncControllerTask.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/task/SyncControllerTask.java
index 18567d5..be05e30 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/task/SyncControllerTask.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/task/SyncControllerTask.java
@@ -41,6 +41,7 @@ public class SyncControllerTask implements Runnable {
       try {
         Thread.sleep(1000);
       } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
         // exit out of the sync-wait-loop
         break;
       }

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseGizmoVisualizationContext.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseGizmoVisualizationContext.java
index 066873d..4177b44 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseGizmoVisualizationContext.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseGizmoVisualizationContext.java
@@ -798,6 +798,7 @@ public class BaseGizmoVisualizationContext implements VisualizationContext {
         Thread.sleep(10);
       } catch (InterruptedException exc) {
         LOG.error(AaiUiMsgs.PROCESSING_LOOP_INTERUPTED, exc.getMessage());
+        Thread.currentThread().interrupt();
         return;
       }
 

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContext.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContext.java
index 21f7fdd..aa4508c 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContext.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContext.java
@@ -1445,6 +1445,7 @@ public class BaseVisualizationContext implements VisualizationContext {
         Thread.sleep(10);
       } catch (InterruptedException exc) {
         LOG.error(AaiUiMsgs.PROCESSING_LOOP_INTERUPTED, exc.getMessage());
+        Thread.currentThread().interrupt();
         return;
       }