svn commit: r587895 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java

[rickhall]

Author: rickhall
Date: Wed Oct 24 07:18:17 2007
New Revision: 587895

URL: http://svn.apache.org/viewvc?rev=587895&view=rev
Log:
Use system bundle when firing a framework error event when an install error
occurs. Also cleaned up a few other areas.

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=587895&r1=587894&r2=587895&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 Oct 24 07:18:17 2007
@@ -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
+}