X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2FRemoteRpcProviderFactory.java;h=af36b8afc9b982b82fbb389111fb70821bd52aa6;hb=refs%2Fchanges%2F62%2F27562%2F9;hp=2e355d4f5146b13c31ee9f4a66a1bbed757d9354;hpb=eeb7581f3d675fa499638e90f01e657c73c67c73;p=controller.git

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 2e355d4f51..af36b8afc9 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,42 +9,17 @@
 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.opendaylight.controller.sal.core.api.RpcProvisionRegistry;
 import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class RemoteRpcProviderFactory {
-    private static final Logger LOG = LoggerFactory.getLogger(RemoteRpcProviderFactory.class);
+    public static RemoteRpcProvider createInstance(final Broker broker, final BundleContext bundleContext,
+            final ActorSystem actorSystem, final RemoteRpcProviderConfig config) {
 
-    public static RemoteRpcProvider createInstance(
-            final Broker broker, final BundleContext bundleContext, final RemoteRpcProviderConfig config){
+        final RemoteRpcProvider rpcProvider = new RemoteRpcProvider(actorSystem, (DOMRpcProviderService) broker, config);
 
-      RemoteRpcProvider rpcProvider =
-          new RemoteRpcProvider(createActorSystem(bundleContext, config), (RpcProvisionRegistry) broker);
-
-      broker.registerProvider(rpcProvider);
-      return rpcProvider;
-    }
-
-    private static ActorSystem createActorSystem(BundleContext bundleContext, RemoteRpcProviderConfig config){
-
-        // Create an OSGi bundle classloader for actor system
-        BundleDelegatingClassLoader classLoader =
-                new BundleDelegatingClassLoader(bundleContext.getBundle(),
-                        Thread.currentThread().getContextClassLoader());
-
-        Config actorSystemConfig = config.get();
-        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);
+        broker.registerProvider(rpcProvider);
+        return rpcProvider;
     }
 }