Merge "Fixed participant registration ACK"
diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java
index d3f6c4d..be8ef00 100644
--- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java
+++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java
@@ -248,6 +248,14 @@
     public void handleParticipantRegisterAck(ParticipantRegisterAck participantRegisterAckMsg) {
         LOGGER.debug("ParticipantRegisterAck message received as responseTo {}",
                 participantRegisterAckMsg.getResponseTo());
+        if (ParticipantHealthStatus.UNKNOWN.equals(this.healthStatus)) {
+            this.healthStatus = ParticipantHealthStatus.HEALTHY;
+        }
+
+        if (ParticipantState.UNKNOWN.equals(this.state)) {
+            this.state = ParticipantState.PASSIVE;
+        }
+        sender.sendParticipantStatus(makeHeartbeat(false));
     }
 
     /**