Author: jwross
Date: Mon Apr 25 13:05:42 2016
New Revision: 1740836
URL: http://svn.apache.org/viewvc?rev=1740836&view=rev
Log:
Merge ^/aries/trunk/subsystem r1740364 through r1740835 into java6support
branch.
Added:
aries/branches/java6support/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1538Test.java
- copied unchanged from r1740835,
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1538Test.java
Modified:
aries/branches/java6support/subsystem/ (props changed)
aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java
Propchange: aries/branches/java6support/subsystem/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 25 13:05:42 2016
@@ -1,2 +1,2 @@
/aries/branches/1.0-prototype/subsystem:1306564-1337594
-/aries/trunk/subsystem:1728111-1740363
+/aries/trunk/subsystem:1728111-1740835
Modified:
aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java
URL:
http://svn.apache.org/viewvc/aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java?rev=1740836&r1=1740835&r2=1740836&view=diff
==============================================================================
---
aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java
(original)
+++
aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java
Mon Apr 25 13:05:42 2016
@@ -200,6 +200,12 @@ public class ResolveContext extends org.
// it gets added to the sharing policy
per the specification.
capabilities.add(new
MissingCapability(requirement));
}
+ // Is the requirement resource already
resolved? See ARIES-1538.
+ else if (isResolved(requirement.getResource()))
{
+ // Yes, the resource has already been
resolved. Do not fail
+ // the subsystem resolution due to a
missing dependency.
+ capabilities.add(new
MissingCapability(requirement));
+ }
}
}
catch (Throwable t) {
