Merge "Fixed error when uploading CBA when Hazelcast cluster is not initialized"

1 files changed, 2 insertions, 4 deletions

diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/BlueprintProcessorCatalogServiceImpl.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/BlueprintProcessorCatalogServiceImpl.kt
index 10a526365..5b9853855 100755
--- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/BlueprintProcessorCatalogServiceImpl.kt
+++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/BlueprintProcessorCatalogServiceImpl.kt
@@ -180,11 +180,9 @@ class BlueprintProcessorCatalogServiceImpl(
 
     private suspend fun cleanClassLoader(cacheKey: String) {
         val clusterService = BlueprintDependencyService.optionalClusterService()
-        if (null == clusterService)
-            BlueprintCompileCache.cleanClassLoader(cacheKey)
-        else {
+        if (clusterService != null && clusterService.clusterJoined()) {
             log.info("Sending ClusterMessage: Clean Classloader Cache")
             clusterService.sendMessage(BlueprintClusterTopic.BLUEPRINT_CLEAN_COMPILER_CACHE, cacheKey)
-        }
+        } else BlueprintCompileCache.cleanClassLoader(cacheKey)
     }
 }