Author: rfeng
Date: Thu Dec 4 16:45:34 2008
New Revision: 723535
URL: http://svn.apache.org/viewvc?rev=723535&view=rev
Log:
Make sure we honor @target over autowire
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java?rev=723535&r1=723534&r2=723535&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
(original)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
Thu Dec 4 16:45:34 2008
@@ -396,7 +396,7 @@
List<Endpoint> endpoints = new ArrayList<Endpoint>();
- if (componentReference.getAutowire() == Boolean.TRUE) {
+ if (componentReference.getAutowire() == Boolean.TRUE &&
componentReference.getTargets().isEmpty()) {
// Find suitable targets in the current composite for an
// autowired reference
