felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1381864 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
Date Fri, 07 Sep 2012 04:50:33 GMT
Author: djencks
Date: Fri Sep  7 04:50:33 2012
New Revision: 1381864

URL: http://svn.apache.org/viewvc?rev=1381864&view=rev
Log:
FELIX-3645 try to find out what went wrong in CollectDependencies

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java?rev=1381864&r1=1381863&r2=1381864&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
Fri Sep  7 04:50:33 2012
@@ -1544,6 +1544,12 @@ public abstract class AbstractComponentM
                     acm.obtainReadLock( "AbstractComponentManager.Unsatisfied.activate.1"
);
                     return false;
                 }
+                catch ( Throwable t )
+                {
+                    acm.log( LogService.LOG_ERROR, "Unexpected throwable from attempt to
collect dependencies", t );
+                    acm.obtainReadLock( "AbstractComponentManager.Unsatisfied.activate.1"
);
+                    return false;
+                }
                 acm.obtainWriteLock( "AbstractComponentManager.Unsatisfied.activate.1" );
                 try
                 {



Mime
View raw message