Author: rfeng
Date: Thu Mar 27 11:18:06 2008
New Revision: 641932
URL: http://svn.apache.org/viewvc?rev=641932&view=rev
Log:
Fix for TUSCANY-2155
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java?rev=641932&r1=641931&r2=641932&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
Thu Mar 27 11:18:06 2008
@@ -420,7 +420,7 @@
// Connect each component reference to the corresponding reference
for (ComponentReference componentReference :
component.getReferences()) {
- if(componentReference.isCallback()) {
+ if (componentReference.getReference() != null ||
componentReference.isCallback()) {
continue;
}
Reference reference = references.get(componentReference.getName());
@@ -532,7 +532,7 @@
// Connect each component service to the corresponding service
for (ComponentService componentService : component.getServices()) {
- if(componentService.isCallback()) {
+ if (componentService.getService() != null ||
componentService.isCallback()) {
continue;
}
Service service = services.get(componentService.getName());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
