svn commit: r1144166 - /openejb/trunk/openejb3/container/openejb-osgi-core/src/main/java/org/apache/openejb/osgi/core/BundleFinderFactory.java

[djencks]

Author: djencks
Date: Fri Jul  8 06:16:11 2011
New Revision: 1144166

URL: http://svn.apache.org/viewvc?rev=1144166&view=rev
Log:
GERONIMO-6043 remember to call link on the finder

Modified:
    
openejb/trunk/openejb3/container/openejb-osgi-core/src/main/java/org/apache/openejb/osgi/core/BundleFinderFactory.java

Modified: 
openejb/trunk/openejb3/container/openejb-osgi-core/src/main/java/org/apache/openejb/osgi/core/BundleFinderFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-osgi-core/src/main/java/org/apache/openejb/osgi/core/BundleFinderFactory.java?rev=1144166&r1=1144165&r2=1144166&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-osgi-core/src/main/java/org/apache/openejb/osgi/core/BundleFinderFactory.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-osgi-core/src/main/java/org/apache/openejb/osgi/core/BundleFinderFactory.java
 Fri Jul  8 06:16:11 2011
@@ -57,6 +57,7 @@ public class BundleFinderFactory extends
             boolean useLocation = location != null
                     && !location.isEmpty()
                     && !module.isStandaloneModule();
+            BundleAnnotationFinder bundleAnnotationFinder;
             if (useLocation) {
                 ResourceDiscoveryFilter filter = new ResourceDiscoveryFilter() 
{
 
@@ -76,7 +77,7 @@ public class BundleFinderFactory extends
                     }
                 };
 
-                return new BundleAnnotationFinder(packageAdmin, bundle, 
filter);
+                bundleAnnotationFinder = new 
BundleAnnotationFinder(packageAdmin, bundle, filter);
             } else {
                 ResourceDiscoveryFilter filter = new ResourceDiscoveryFilter() 
{
 
@@ -96,8 +97,10 @@ public class BundleFinderFactory extends
                     }
                 };
 
-                return new BundleAnnotationFinder(packageAdmin, bundle, 
filter);
+                bundleAnnotationFinder = new 
BundleAnnotationFinder(packageAdmin, bundle, filter);
             }
+            bundleAnnotationFinder.link();
+            return bundleAnnotationFinder;
         }
 
         throw new IllegalStateException("Module classloader is not a 
BundleReference. Only use BundleFactoryFinder in an pure osgi environment");