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

[fmeschbe]

Author: fmeschbe
Date: Sun Aug 24 23:58:56 2008
New Revision: 688638

URL: http://svn.apache.org/viewvc?rev=688638&view=rev
Log:
FELIX-698 Log an INFO message only if the bundle whose components
should be started has been stopped in the mean time.

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=688638&r1=688637&r2=688638&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 Sun 
Aug 24 23:58:56 2008
@@ -230,8 +230,21 @@
         }
         catch ( Exception e )
         {
-            log( LogService.LOG_ERROR, m_context.getBundle(), "Error while 
loading components of bundle "
-                + bundle.getSymbolicName(), e );
+            if ( e instanceof IllegalStateException && bundle.getState() != 
Bundle.ACTIVE )
+            {
+                log(
+                    LogService.LOG_INFO,
+                    m_context.getBundle(),
+                    "Bundle "
+                        + bundle.getSymbolicName()
+                        + " has been stopped while trying to activate its 
components. Trying again when the bundles gets startet again.",
+                    e );
+            }
+            else
+            {
+                log( LogService.LOG_ERROR, m_context.getBundle(), "Error while 
loading components of bundle "
+                    + bundle.getSymbolicName(), e );
+            }
         }
     }