Author: mcombellack
Date: Tue Feb 26 08:20:19 2008
New Revision: 631273
URL: http://svn.apache.org/viewvc?rev=631273&view=rev
Log:
Fixed issue with resolving Components when using nested Composites - bascially
it was not looking in nested Composites as it was doing the startsWith() check
wrongly
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java?rev=631273&r1=631272&r2=631273&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
Tue Feb 26 08:20:19 2008
@@ -826,13 +826,12 @@
}
public Component resolve(Composite composite, String componentURI) {
- String prefix = componentURI + "/";
for (Component component : composite.getComponents()) {
String uri = component.getURI();
if (uri.equals(componentURI)) {
return component;
}
- if (componentURI.startsWith(prefix)) {
+ if (componentURI.startsWith(uri)) {
Implementation implementation = component.getImplementation();
if (!(implementation instanceof Composite)) {
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
