1 files changed, 8 insertions, 5 deletions

diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/NokiaSvnfmApplication.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/NokiaSvnfmApplication.java
index 40abab1a..f1c2a6f0 100644
--- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/NokiaSvnfmApplication.java
+++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/NokiaSvnfmApplication.java
@@ -55,10 +55,6 @@ public class NokiaSvnfmApplication {
         systemFunctions().newSpringApplication(NokiaSvnfmApplication.class).run(args);
     }
 
-    private static boolean isDirect(ConfigurableApplicationContext applicationContext) {
-        return newHashSet(applicationContext.getEnvironment().getActiveProfiles()).contains("direct");
-    }
-
     /**
      * Responsible for starting the self registration process after the servlet has been started
      * and is ready to answer REST request
@@ -104,7 +100,8 @@ public class NokiaSvnfmApplication {
                 return true;
             };
             executorService.submit(() -> {
-                while (!jobManagerForVfc.isPreparingForShutDown() && !jobManagerForSo.isPreparingForShutDown()) {
+                boolean notPrepareForShutDown = !jobManagerForVfc.isPreparingForShutDown() && !jobManagerForSo.isPreparingForShutDown();
+                while (notPrepareForShutDown) {
                     try {
                         executorService.submit(singleRegistration).get();
                         //registration successful
@@ -112,11 +109,17 @@ public class NokiaSvnfmApplication {
                     } catch (Exception e) {
                         logger.warn("Unable to execute self registration process", e);
                     }
+
                     systemFunctions().sleep(5000);
                 }
+                logger.warn("Component is preparing for shutdown giving up component start");
             });
         }
 
+        private static boolean isDirect(ConfigurableApplicationContext applicationContext) {
+            return newHashSet(applicationContext.getEnvironment().getActiveProfiles()).contains("direct");
+        }
+
     }
 
     /**