Reenable the EquinoxHost test case that was ignored due to NPE

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

2 files changed, 8 insertions, 10 deletions

diff --git a/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/FrameworkLauncher.java b/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/FrameworkLauncher.java
index 380056e470..5714df2a5d 100644
--- a/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/FrameworkLauncher.java
+++ b/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/FrameworkLauncher.java
@@ -38,6 +38,8 @@ import org.osgi.framework.launch.FrameworkFactory;
  * Launcher for the OSGi framework using the framework launch APIs
  */
 public class FrameworkLauncher implements BundleActivator {
+    private static final String FACTORY_RESOURCE = "META-INF/services/" + FrameworkFactory.class.getName();
+
     private static final Logger logger = Logger.getLogger(FrameworkLauncher.class.getName());
 
     private FrameworkFactory factory;
@@ -46,14 +48,12 @@ public class FrameworkLauncher implements BundleActivator {
     @SuppressWarnings("unchecked")
     private synchronized FrameworkFactory loadFrameworkFactory() {
         if (factory == null) {
-            // Use reflection APIs to call ServiceDiscovery to avoid hard dependency to tuscany-extensibility
             try {
-                ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-                InputStream is =
-                    classLoader.getResourceAsStream("META-INF/services/" + FrameworkFactory.class.getName());
+                ClassLoader classLoader = FrameworkFactory.class.getClassLoader();
+                InputStream is = classLoader.getResourceAsStream(FACTORY_RESOURCE);
                 if (is == null) {
-                    classLoader = FrameworkFactory.class.getClassLoader();
-                    is = classLoader.getResourceAsStream("META-INF/services/" + FrameworkFactory.class.getName());
+                    classLoader = Thread.currentThread().getContextClassLoader();
+                    is = classLoader.getResourceAsStream(FACTORY_RESOURCE);
                 }
                 if (is == null) {
                     return null;
@@ -61,7 +61,7 @@ public class FrameworkLauncher implements BundleActivator {
                 BufferedReader reader = null;
                 String line = null;
                 try {
-                    reader = new BufferedReader(new InputStreamReader(is));
+                    reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
                     while (true) {
                         line = reader.readLine();
                         if (line == null)
diff --git a/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java b/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
index c463749dc6..5728ad2e07 100644
--- a/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
+++ b/java/sca/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
@@ -23,16 +23,14 @@ import java.util.Dictionary;
 import java.util.Enumeration;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 
 
 /**
- * 
+ * Test case for equinox host
  */
-@Ignore
 public class EquinoxOSGiHostTestCase {
 
     @Test