Simplified a bit the service discovery implementation. Some code cleanup in node-launcher-equinox. Started to remove dependencies on a particular setting of the Thread Context ClassLoader.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@692989 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 4 deletions

diff --git a/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java b/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
index 4eeb706767..5e4a0ed338 100644
--- a/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
+++ b/java/sca/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
@@ -41,7 +41,7 @@ public class FelixOSGiHost implements OSGiHost {
 
     private Felix felix;
     private LauncherBundleActivator activator;
-    private ClassLoader tccl;
+    //private ClassLoader tccl;
 
     private final static String systemPackages =
         "org.osgi.framework; version=1.3.0," + "org.osgi.service.packageadmin; version=1.2.0, "
@@ -137,8 +137,8 @@ public class FelixOSGiHost implements OSGiHost {
         // Now start Felix instance.
         felix.start();
 
-        tccl = Thread.currentThread().getContextClassLoader();
-        Thread.currentThread().setContextClassLoader(getContextClassLoader(felix.getBundleContext()));
+        //tccl = Thread.currentThread().getContextClassLoader();
+        //Thread.currentThread().setContextClassLoader(getContextClassLoader(felix.getBundleContext()));
 
     }
 
@@ -168,7 +168,7 @@ public class FelixOSGiHost implements OSGiHost {
         if (felix != null) {
             felix.stopAndWait();
         }
-        Thread.currentThread().setContextClassLoader(tccl);
+        //Thread.currentThread().setContextClassLoader(tccl);
     }
 
 }