commit 13598d2a6134e417d9fdf2d199aa83ba86fa0218
author Dan Timoney <dtimoney@att.com> Wed Apr 28 22:50:38 2021 +0000
committer Gerrit Code Review <gerrit@onap.org> Wed Apr 28 22:50:38 2021 +0000
tree 9fc02404ae03e58d7a0e05b5866c7e45f2a71d36
parent 41f66ef2e223d4925d1dc94e3d898b308fdb560e
parent 7727db93b8c157e3b6e563c1f8093f8eddd9ad5a

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

ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/BlueprintProcessorCatalogServiceImpl.kt

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 10a5263..5b98538 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 @@
 
     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)
     }
 }