Merge "Fix Akka exception: cannot use non-static local Creator to create actors"

diff --combined opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcManager.java
index fb8822d07ce5e31af96bb979f4730abc41141385,34c4401f50a179fa63faf48790532fc6c8b04d05..4cbce63f9aa2a9b9f44f4c1ba3a27a225d4c2d42
--- 1/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcManager.java
--- 2/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcManager.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcManager.java
@@@ -13,8 -13,8 +13,8 @@@ import akka.actor.ActorRef
  import akka.actor.OneForOneStrategy;
  import akka.actor.Props;
  import akka.actor.SupervisorStrategy;
- import akka.japi.Creator;
  import akka.japi.Function;
+ import java.util.Set;
  import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor;
  import org.opendaylight.controller.remote.rpc.messages.UpdateSchemaContext;
  import org.opendaylight.controller.remote.rpc.registry.RpcRegistry;
@@@ -26,8 -26,6 +26,6 @@@ import org.slf4j.Logger
  import org.slf4j.LoggerFactory;
  import scala.concurrent.duration.Duration;
  
- import java.util.Set;
- 
  /**
   * This class acts as a supervisor, creates all the actors, resumes them, if an exception is thrown.
   *
@@@ -61,17 -59,10 +59,10 @@@ public class RpcManager extends Abstrac
    }
  
  
-   public static Props props(final SchemaContext schemaContext,
-                             final Broker.ProviderSession brokerSession,
-                             final RpcProvisionRegistry rpcProvisionRegistry) {
-     return Props.create(new Creator<RpcManager>() {
-       private static final long serialVersionUID = 1L;
-       @Override
-       public RpcManager create() throws Exception {
-         return new RpcManager(schemaContext, brokerSession, rpcProvisionRegistry);
-       }
-     });
-   }
+     public static Props props(final SchemaContext schemaContext, final Broker.ProviderSession brokerSession,
+             final RpcProvisionRegistry rpcProvisionRegistry) {
+         return Props.create(RpcManager.class, schemaContext, brokerSession, rpcProvisionRegistry);
+     }
  
    private void createRpcActors() {
      LOG.debug("Create rpc registry and broker actors");
@@@ -123,7 -114,6 +114,7 @@@
  
    private void updateSchemaContext(UpdateSchemaContext message) {
      this.schemaContext = message.getSchemaContext();
 +    rpcBroker.tell(message, ActorRef.noSender());
    }
  
    @Override