Author: not
Date: Tue Feb 15 18:40:49 2011
New Revision: 1071009
URL: http://svn.apache.org/viewvc?rev=1071009&view=rev
Log:
ARIES-576 move the call to getMissingDependencies so it occurs prior to cleanup
of ReferenceRecepies. The previous position occurred after the
ReferenceRecepies had been stopped
so they all reported themselves as missing, even if they had not been missing.
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java?rev=1071009&r1=1071008&r2=1071009&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
(original)
+++
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
Tue Feb 15 18:40:49 2011
@@ -287,16 +287,16 @@ public class BlueprintContainerImpl impl
synchronized (scheduled) {
Throwable t = new TimeoutException();
state = State.Failed;
+ String[] missingDependecies =
getMissingDependencies();
unregisterServices();
untrackServiceReferences();
destroyComponents();
- String[] missingDependecies =
getMissingDependencies();
LOGGER.error("Unable to start blueprint
container for bundle " + bundleContext.getBundle().getSymbolicName() + " due to
unresolved dependencies " + Arrays.asList(missingDependecies), t);
eventDispatcher.blueprintEvent(new
BlueprintEvent(BlueprintEvent.FAILURE, getBundleContext().getBundle(),
getExtenderBundle(), missingDependecies, t));
}
}
};
- timeoutFuture = executors.schedule(r, timeout,
TimeUnit.MILLISECONDS);
+ timeoutFuture = executors.schedule(r, 10,
TimeUnit.SECONDS);
state = State.WaitForInitialReferences;
break;
case WaitForInitialReferences:
