Fix multiple concurrency related issues

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

1 files changed, 10 insertions, 27 deletions

diff --git a/sca-java-2.x/trunk/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java b/sca-java-2.x/trunk/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java
index 5e32a9a62e..111f1f370c 100644
--- a/sca-java-2.x/trunk/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java
+++ b/sca-java-2.x/trunk/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java
@@ -57,8 +57,6 @@ public class OSGiBundleContributionScanner implements ContributionScanner {
         return PackageType.BUNDLE;
     }
 
-
-
     public List<Artifact> scan(Contribution contribution) throws ContributionReadException {
         Bundle bundle = OSGiBundleActivator.findBundle(contribution.getLocation());
 
@@ -99,22 +97,28 @@ public class OSGiBundleContributionScanner implements ContributionScanner {
                 //Add artifact to list
                 Artifact artifact = contributionFactory.createArtifact();
                 artifact.setURI(entryName);
-                artifact.setLocation(getArtifactURL(contribution, entryName).toString());
+                artifact.setLocation(entry.toString());
                 
                 artifacts.add(artifact);
 
                 //if Artifact is a JAR, add jar artifacts as well
+                /*
                 if (entryName.endsWith(".jar") && bundleClassPath.contains(entryName)) {
                     List<String> jarArtifactURIs = getJarArtifacts(entry, entry.openStream());
                     for( String uri : jarArtifactURIs) {
                         Artifact jarArtifact = contributionFactory.createArtifact();
                         jarArtifact.setURI(uri);
-                        jarArtifact.setLocation(getArtifactURL(contribution, uri).toString());
-                        
+                        URL url = bundle.getResource(uri);
+                        String location = null;
+                        if(url!=null) {
+                            location = url.toString();
+                        }
+                        jarArtifact.setLocation(location);
                         artifacts.add(jarArtifact);
                         
                     }
                 }
+                */
 
             }
         } catch (Exception e) {
@@ -125,7 +129,7 @@ public class OSGiBundleContributionScanner implements ContributionScanner {
         contribution.setClassLoader(new BundleClassLoader(bundle));
         return artifacts;
     }
-
+    
     /**
      * Retrieve a list of Artifact URIs for a given JAR
      * @param packageSourceURL
@@ -184,27 +188,6 @@ public class OSGiBundleContributionScanner implements ContributionScanner {
     }
     
 
-    /**
-     * Given an artifact URI, return it's location URL
-     * 
-     * @param contribution
-     * @param artifact
-     * @return
-     * @throws ContributionReadException
-     */
-    private URL getArtifactURL(Contribution contribution, String artifact) throws ContributionReadException {
-        Bundle bundle = null;
-        try {
-            bundle = OSGiBundleActivator.findBundle(contribution.getLocation());
-            if (bundle != null) {
-                URL url = bundle.getResource(artifact);
-                return url;
-            }
-        } catch (Exception e) {
-        }
-        return null;
-    }
-
 
     private static class BundleClassLoader extends ClassLoader {
         private Bundle bundle;