X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDataChangeListenerRegistrationActor.java;h=2632498a03a9db3a1f6fd43573e3eb3ce15713f1;hb=175f38490b56c4b4e0ec356b17b91f887b295da4;hp=bbeb13f936aebf59d4eea6f0eefa2fef72256d49;hpb=d9ea4400df226eb65c964ab0cb2aa81ee495ba15;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerRegistrationActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerRegistrationActor.java
index bbeb13f936..2632498a03 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerRegistrationActor.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerRegistrationActor.java
@@ -12,7 +12,6 @@ import akka.actor.PoisonPill;
 import akka.actor.Props;
 import akka.japi.Creator;
 import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor;
-
 import org.opendaylight.controller.cluster.datastore.messages.CloseDataChangeListenerRegistration;
 import org.opendaylight.controller.cluster.datastore.messages.CloseDataChangeListenerRegistrationReply;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeListener;
@@ -31,10 +30,11 @@ public class DataChangeListenerRegistrationActor extends AbstractUntypedActor {
     }
 
     @Override
-    public void handleReceive(Object message) throws Exception {
-        if (message.getClass().equals(CloseDataChangeListenerRegistration.SERIALIZABLE_CLASS)) {
-            closeListenerRegistration(
-                new CloseDataChangeListenerRegistration());
+    public void handleReceive(Object message) {
+        if (message instanceof CloseDataChangeListenerRegistration) {
+            closeListenerRegistration();
+        } else {
+            unknownMessage(message);
         }
     }
 
@@ -43,11 +43,9 @@ public class DataChangeListenerRegistrationActor extends AbstractUntypedActor {
         return Props.create(new DataChangeListenerRegistrationCreator(registration));
     }
 
-    private void closeListenerRegistration(
-        CloseDataChangeListenerRegistration message) {
+    private void closeListenerRegistration() {
         registration.close();
-        getSender()
-            .tell(new CloseDataChangeListenerRegistrationReply().toSerializable(), getSelf());
+        getSender().tell(CloseDataChangeListenerRegistrationReply.INSTANCE, getSelf());
         getSelf().tell(PoisonPill.getInstance(), getSelf());
     }