BUG 3566 : Get remote-rpc working again

[controller.git] / opendaylight / md-sal / sal-remoterpc-connector / src / main / java / org / opendaylight / controller / remote / rpc / RpcBroker.java

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcBroker.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcBroker.java
index 7ddac673c2e84827b5cb18d015319b13e587ad97..4dee5dabb791870be78f97cdd66d04b867deda7e 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcBroker.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcBroker.java
@@ -138,6 +138,8 @@ public class RpcBroker extends AbstractUntypedActor {
                     return;
                 }
 
+                LOG.debug("Execute Rpc response received for rpc : {}, responding to sender : {}", msg.getRpc(), sender);
+
                 sender.tell(reply, self);
             }
         };
@@ -174,7 +176,15 @@ public class RpcBroker extends AbstractUntypedActor {
                     sender.tell(new akka.actor.Status.Failure(new RpcErrorsException(
                             message, errors)), self);
                 } else {
-                    final Node serializedResultNode = NormalizedNodeSerializer.serialize(result.getResult());
+                    final Node serializedResultNode;
+                    if(result.getResult() == null){
+                        serializedResultNode = null;
+                    } else {
+                        serializedResultNode = NormalizedNodeSerializer.serialize(result.getResult());
+                    }
+
+                    LOG.debug("Sending response for execute rpc : {}", msg.getRpc());
+
                     sender.tell(new RpcResponse(serializedResultNode), self);
                 }
             }