Author: jmarino
Date: Thu Jan  4 14:29:36 2007
New Revision: 492780

URL: http://svn.apache.org/viewvc?view=rev&rev=492780
Log:
limit wire optimizations to AtomicComponent targets

Modified:
    
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java

Modified: 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=492780&r1=492779&r2=492780
==============================================================================
--- 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
 Thu Jan  4 14:29:36 2007
@@ -119,7 +119,8 @@
         // perform optimization, if possible
         if (optimizable
             && WireUtils.isOptimizable(sourceWire)
-            && WireUtils.isOptimizable(targetWire)) {
+            && WireUtils.isOptimizable(targetWire)
+            && targetWire.getContainer() instanceof AtomicComponent) {
             sourceWire.setTargetWire(targetWire);
         }
     }
@@ -287,7 +288,8 @@
         // perform optimization, if possible
         if (optimizable
             && WireUtils.isOptimizable(sourceWire)
-            && WireUtils.isOptimizable(targetWire)) {
+            && WireUtils.isOptimizable(targetWire)
+            && targetWire.getContainer() instanceof AtomicComponent) {
             sourceWire.setOptimizable(true);
             sourceWire.setTargetWire(targetWire);
         }
@@ -556,7 +558,7 @@
 
     protected boolean isOptimizable(Scope pReferrer, Scope pReferee) {
         if (pReferrer == Scope.UNDEFINED
-            || pReferee == Scope.UNDEFINED 
+            || pReferee == Scope.UNDEFINED
             || pReferrer == Scope.CONVERSATION
             || pReferee == Scope.CONVERSATION) {
             return false;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to