commit faa3d61517152f3aa59464b6d59569db5a49080a
author Richard S. Hall <rickhall@apache.org> Wed Oct 24 14:18:17 2007 +0000
committer Richard S. Hall <rickhall@apache.org> Wed Oct 24 14:18:17 2007 +0000
tree ceb161baa5727c26520dc16266cbe2b48b1ea043
parent 7395aadd5d8b087e5258458979910d56cdaec8e6

Use system bundle when firing a framework error event when an install error
occurs. Also cleaned up a few other areas.


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@587895 13f79535-47bb-0310-9956-ffa450edef68

framework/src/main/java/org/apache/felix/framework/Felix.java

diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java
index a0f8635..bc366ff 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -765,10 +765,8 @@
             }
             catch (Exception ex)
             {
-// TODO: RB - Should this be system bundle, since bundle could be null?
-//                fireFrameworkEvent(FrameworkEvent.ERROR, systembundle, ex);
 ex.printStackTrace();
-                fireFrameworkEvent(FrameworkEvent.ERROR, bundle, ex);
+                fireFrameworkEvent(FrameworkEvent.ERROR, this, ex);
                 try
                 {
                     m_logger.log(
@@ -875,7 +873,7 @@
                 }
                 catch (BundleException ex)
                 {
-                    fireFrameworkEvent(FrameworkEvent.ERROR, getBundle(0), ex);
+                    fireFrameworkEvent(FrameworkEvent.ERROR, this, ex);
                     m_logger.log(
                         Logger.LOG_ERROR,
                         "Error stopping system bundle.",
@@ -1107,7 +1105,7 @@
 
         if (m_systemBundleInfo.getState() == Bundle.ACTIVE)
         {
-            fireFrameworkEvent(FrameworkEvent.STARTLEVEL_CHANGED, getBundle(0), null);
+            fireFrameworkEvent(FrameworkEvent.STARTLEVEL_CHANGED, this, null);
         }
     }
 
@@ -3230,7 +3228,7 @@
             releaseBundleLocks(bundles);
         }
 
-        fireFrameworkEvent(FrameworkEvent.PACKAGES_REFRESHED, getBundle(0), null);
+        fireFrameworkEvent(FrameworkEvent.PACKAGES_REFRESHED, this, null);
     }
 
     private void populateImportGraph(FelixBundle exporter, Map map)
@@ -4553,4 +4551,4 @@
             m_bundleLock.notifyAll();
         }
     }
-}
\ No newline at end of file
+}