commit 66700e477fa800b80b92aed26dbca6bf0f686602
author David Jencks <djencks@apache.org> Fri Sep 07 04:50:33 2012 +0000
committer David Jencks <djencks@apache.org> Fri Sep 07 04:50:33 2012 +0000
tree 95a4eb17dcfd21b75ec5913adeb5f6136f190686
parent 683185402ccd54e30294212537ab75f0c2c32375

FELIX-3645 try to find out what went wrong in CollectDependencies

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

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

diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
index 1875ac5..106a997 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
@@ -1544,6 +1544,12 @@
                     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
                 {