Fix nullpointer issue in pdpx heartbeat

[policy/xacml-pdp.git] / main / src / main / java / org / onap / policy / pdpx / main / comm / XacmlPdpMessage.java

diff --git a/main/src/main/java/org/onap/policy/pdpx/main/comm/XacmlPdpMessage.java b/main/src/main/java/org/onap/policy/pdpx/main/comm/XacmlPdpMessage.java
index 802d735..066e3f2 100644 (file)
--- a/main/src/main/java/org/onap/policy/pdpx/main/comm/XacmlPdpMessage.java
+++ b/main/src/main/java/org/onap/policy/pdpx/main/comm/XacmlPdpMessage.java
@@ -79,7 +79,7 @@ public class XacmlPdpMessage {
         PdpStatus status = new PdpStatus();
         status.setName(pdpName);
 
-        if (XacmlPdpActivator.getCurrent().isAlive()) {
+        if (XacmlPdpActivator.getCurrent() != null && XacmlPdpActivator.getCurrent().isAlive()) {
             status.setHealthy(PdpHealthStatus.HEALTHY);
         } else {
             status.setHealthy(PdpHealthStatus.NOT_HEALTHY);