Merge "Fixing issue where PdpRegistration message is treated as Heartbeat by PAP"
diff --git a/main/src/main/java/org/onap/policy/pap/main/comm/PdpStatusMessageHandler.java b/main/src/main/java/org/onap/policy/pap/main/comm/PdpStatusMessageHandler.java
index 6998140..09ee64d 100644
--- a/main/src/main/java/org/onap/policy/pap/main/comm/PdpStatusMessageHandler.java
+++ b/main/src/main/java/org/onap/policy/pap/main/comm/PdpStatusMessageHandler.java
@@ -66,7 +66,7 @@
     public void handlePdpStatus(final PdpStatus message) {
         synchronized (updateLock) {
             try (PolicyModelsProvider databaseProvider = modelProviderWrapper.create()) {
-                if (message.getPdpGroup() == null && message.getPdpSubgroup() == null) {
+                if (message.getPdpSubgroup() == null) {
                     handlePdpRegistration(message, databaseProvider);
                 } else {
                     handlePdpHeartbeat(message, databaseProvider);