svn commit: r1703652 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/Activator.java

[djencks]

Author: djencks
Date: Thu Sep 17 17:18:30 2015
New Revision: 1703652

URL: http://svn.apache.org/viewvc?rev=1703652&view=rev
Log:
FELIX-5040 getBundle by location for global extender

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/Activator.java

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/Activator.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/Activator.java?rev=1703652&r1=1703651&r2=1703652&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/Activator.java 
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/Activator.java Thu 
Sep 17 17:18:30 2015
@@ -115,7 +115,7 @@ public class Activator extends AbstractE
         BundleContext context;
         if ( globalExtender )
         {
-            context = m_context.getBundle( 0 ).getBundleContext();
+            context = m_context.getBundle( Constants.SYSTEM_BUNDLE_LOCATION 
).getBundleContext();
         }
         else
         {
@@ -238,10 +238,21 @@ public class Activator extends AbstractE
 
     //---------- Component Management -----------------------------------------
 
+    private volatile boolean gogoMissing =true;
 
     @Override
     protected Extension doCreateExtension(final Bundle bundle) throws Exception
     {
+        if (gogoMissing)
+        {
+            try
+            {
+                
bundle.loadClass("org.apache.felix.service.command.Descriptor");
+                gogoMissing = false;
+            }
+            catch (Throwable e)
+            {}
+        }
         return new ScrExtension(bundle);
     }