Merge "Fixing Multi JVM Tests and sonar bugs"

1 files changed, 9 insertions, 3 deletions

diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/kafka/TestKafka2Kafka.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/kafka/TestKafka2Kafka.java
index 0874d9827..8468b6d7f 100644
--- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/kafka/TestKafka2Kafka.java
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/kafka/TestKafka2Kafka.java
@@ -91,9 +91,15 @@ public class TestKafka2Kafka {
 
     @AfterClass
     public static void shutdownDummyKafkaServer() throws IOException {
-        kafkaServer.shutdown();
-        zkClient.close();
-        zkServer.shutdown();
+        if (kafkaServer != null) {
+            kafkaServer.shutdown();
+        }
+        if (zkClient != null) {
+            zkClient.close();
+        }
+        if (zkServer != null) {
+            zkServer.shutdown();
+        }
     }
 
     @Test