Mailing-List: contact commits-help@felix.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@felix.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r612553 -
 /felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
Date: Wed, 16 Jan 2008 19:39:28 -0000
To: commits@felix.apache.org
From: pauls@apache.org
Message-Id: <20080116193929.9C0B41A9832@eris.apache.org>

Author: pauls
Date: Wed Jan 16 11:39:23 2008
New Revision: 612553

URL: http://svn.apache.org/viewvc?rev=612553&view=rev
Log:
Fix a NPE on framework restart when extension bundles are installed.

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=612553&r1=612552&r2=612553&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Wed Jan 16 11:39:23 2008
@@ -712,6 +712,22 @@
             archives = null;
         }
 
+        // create the system bundle that is responsible for providing specific 
+        // container related services.
+        IContentLoader cl = m_extensionManager;
+        cl.setSearchPolicy(
+            new R4SearchPolicy(
+                m_policyCore, m_systemBundleInfo.getCurrentModule()));
+        m_factory.setContentLoader(
+            m_systemBundleInfo.getCurrentModule(),
+            cl);
+        m_factory.setSecurityContext(
+            m_systemBundleInfo.getCurrentModule(),
+            getClass().getProtectionDomain());
+
+        m_installedBundleMap.put(
+            m_systemBundleInfo.getLocation(), this);
+        
         FelixBundle bundle = null;
 
         // Now install all cached bundles.
@@ -784,25 +800,10 @@
             }
         }
 
-        // Now that the cached bundles are reloaded, create the system
-        // bundle that is responsible for providing specific container
-        // related services and activating all custom framework activators.
+        // Now that the cached bundles are reloaded, 
+        // activating all custom framework activators.
         try
         {
-            IContentLoader cl = m_extensionManager;
-            cl.setSearchPolicy(
-                new R4SearchPolicy(
-                    m_policyCore, m_systemBundleInfo.getCurrentModule()));
-            m_factory.setContentLoader(
-                m_systemBundleInfo.getCurrentModule(),
-                cl);
-            m_factory.setSecurityContext(
-                m_systemBundleInfo.getCurrentModule(),
-                getClass().getProtectionDomain());
-
-            m_installedBundleMap.put(
-                m_systemBundleInfo.getLocation(), this);
-
             // Manually resolve the System Bundle, which will cause its
             // state to be set to RESOLVED.
             try
@@ -822,8 +823,10 @@
 
             // Create the bundle context for the system bundle and
             // then activate it.
-            m_systemBundleInfo.setBundleContext(new BundleContextImpl(m_logger, this, this));
-            Felix.m_secureAction.startActivator(m_systemBundleInfo.getActivator(), m_systemBundleInfo.getBundleContext());
+            m_systemBundleInfo.setBundleContext(
+                new BundleContextImpl(m_logger, this, this));
+            Felix.m_secureAction.startActivator(m_systemBundleInfo.getActivator(), 
+                m_systemBundleInfo.getBundleContext());
         }
         catch (Throwable ex)
         {
@@ -843,7 +846,8 @@
         try
         {
             StartLevel sl = (StartLevel) getService(
-                getBundle(0),getServiceReferences((FelixBundle) getBundle(0), StartLevel.class.getName(), null, true)[0]);
+                getBundle(0),getServiceReferences((FelixBundle) getBundle(0), 
+                StartLevel.class.getName(), null, true)[0]);
             if (sl instanceof StartLevelImpl)
             {
                 ((StartLevelImpl) sl).setStartLevelAndWait(startLevel);