X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2FRemoteRpcProviderFactory.java;h=226faf22dcced063a49fb28a691a0095fc789c6f;hp=d17242ed6048f51638d11612db130c2d62f33961;hb=c55d6cccb33e3de942e521e31404a60c1738b768;hpb=79501c28d5f3e179cb67390fb160a63fc44bac8f

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderFactory.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderFactory.java
index d17242ed60..226faf22dc 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderFactory.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -9,43 +9,13 @@
 package org.opendaylight.controller.remote.rpc;
 
 import akka.actor.ActorSystem;
-import akka.osgi.BundleDelegatingClassLoader;
-import com.typesafe.config.Config;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
-import org.opendaylight.controller.sal.core.api.Broker;
-import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
 
 public class RemoteRpcProviderFactory {
-    private static final Logger LOG = LoggerFactory.getLogger(RemoteRpcProviderFactory.class);
+    public static RemoteRpcProvider createInstance(final DOMRpcProviderService rpcProviderService,
+            final DOMRpcService rpcService, final ActorSystem actorSystem, final RemoteRpcProviderConfig config) {
 
-    public static RemoteRpcProvider createInstance(
-            final Broker broker, final BundleContext bundleContext, final RemoteRpcProviderConfig config){
-
-      final RemoteRpcProvider rpcProvider =
-          new RemoteRpcProvider(createActorSystem(bundleContext, config), (DOMRpcProviderService) broker);
-
-      broker.registerProvider(rpcProvider);
-      return rpcProvider;
-    }
-
-    private static ActorSystem createActorSystem(final BundleContext bundleContext, final RemoteRpcProviderConfig config){
-
-        // Create an OSGi bundle classloader for actor system
-        final BundleDelegatingClassLoader classLoader =
-                new BundleDelegatingClassLoader(bundleContext.getBundle(),
-                        Thread.currentThread().getContextClassLoader());
-
-        final Config actorSystemConfig = config.get();
-        if(LOG.isDebugEnabled()) {
-            LOG.debug("Actor system configuration\n{}", actorSystemConfig.root().render());
-        }
-        if (config.isMetricCaptureEnabled()) {
-            LOG.info("Instrumentation is enabled in actor system {}. Metrics can be viewed in JMX console.",
-                    config.getActorSystemName());
-        }
-
-        return ActorSystem.create(config.getActorSystemName(), actorSystemConfig, classLoader);
+        return new RemoteRpcProvider(actorSystem, rpcProviderService, rpcService, config);
     }
 }