You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2006/07/25 09:48:07 UTC

svn commit: r425319 - in /incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework: Felix.java util/EventDispatcher.java

Author: rickhall
Date: Tue Jul 25 00:48:06 2006
New Revision: 425319

URL: http://svn.apache.org/viewvc?rev=425319&view=rev
Log:
Added bundle STARTING and STOPPING events (FELIX-34).

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

Modified: incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java?rev=425319&r1=425318&r2=425319&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java Tue Jul 25 00:48:06 2006
@@ -1186,14 +1186,17 @@
                 return;
             case Bundle.INSTALLED:
                 _resolveBundle(bundle);
+                // No break.
             case Bundle.RESOLVED:
                 info.setState(Bundle.STARTING);
+                fireBundleEvent(BundleEvent.STARTING, bundle);
+                break;
         }
 
         try
         {
             // Set the bundle's activator.
-            bundle.getInfo().setActivator(createBundleActivator(bundle.getInfo()));
+            info.setActivator(createBundleActivator(bundle.getInfo()));
 
             // Activate the bundle if it has an activator.
             if (bundle.getInfo().getActivator() != null)
@@ -1215,11 +1218,9 @@
                 }
             }
 
-            info.setState(Bundle.ACTIVE);
-
             // TODO: CONCURRENCY - Reconsider firing event outside of the
             // bundle lock.
-
+            info.setState(Bundle.ACTIVE);
             fireBundleEvent(BundleEvent.STARTED, bundle);
         }
         catch (Throwable th)
@@ -1510,8 +1511,10 @@
             case Bundle.ACTIVE:
                 // Set bundle state..
                 info.setState(Bundle.STOPPING);
+                fireBundleEvent(BundleEvent.STOPPING, bundle);
+                break;
         }
-            
+
         try
         {
             if (bundle.getInfo().getActivator() != null)

Modified: incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java?rev=425319&r1=425318&r2=425319&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java (original)
+++ incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java Tue Jul 25 00:48:06 2006
@@ -477,8 +477,14 @@
         // Fire synchronous bundle listeners immediately on the calling thread.
         fireEventImmediately(m_logger, Request.BUNDLE_EVENT, syncListeners, event);
 
-        // Fire asynchronous bundle listeners on a separate thread.
-        fireEventAsynchronously(m_logger, Request.BUNDLE_EVENT, listeners, event);
+        // The spec says that asynchronous bundle listeners do not get events
+        // of types STARTING or STOPPING.
+        if ((event.getType() != BundleEvent.STARTING) &&
+            (event.getType() != BundleEvent.STOPPING))
+        {
+            // Fire asynchronous bundle listeners on a separate thread.
+            fireEventAsynchronously(m_logger, Request.BUNDLE_EVENT, listeners, event);
+        }
     }
 
     public void fireServiceEvent(ServiceEvent event)
@@ -782,4 +788,4 @@
         public Object[] m_listeners = null;
         public EventObject m_event = null;
     }
-}
\ No newline at end of file
+}