svn commit: r492478 - in /incubator/tuscany/java/sca/kernel/core/src: main/java/org/apache/tuscany/core/builder/ConnectorImpl.java test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java

[jmarino]

Author: jmarino
Date: Thu Jan  4 01:41:50 2007
New Revision: 492478

URL: http://svn.apache.org/viewvc?view=rev&rev=492478
Log:
change when wire optimization check is done

Modified:
    
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
    
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.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=492478&r1=492477&r2=492478
==============================================================================
--- 
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 01:41:50 2007
@@ -104,17 +104,6 @@
             sourceWire.setTargetWire(targetWire);
             // system services do not need to have their chains processed, 
return
             return;
-        } else if (optimizable
-            && WireUtils.isOptimizable(sourceWire)
-            && WireUtils.isOptimizable(targetWire)) {
-            if (postProcessorRegistry != null) {
-                // run wire post-processors
-                postProcessorRegistry.process(sourceWire, targetWire);
-            }
-            if (WireUtils.isOptimizable(sourceWire) && 
WireUtils.isOptimizable(targetWire)) {
-                sourceWire.setTargetWire(targetWire);
-            }
-            // don not return yet, as invocation chains still need to be 
processed
         }
         for (InboundInvocationChain inboundChain : 
sourceWire.getInvocationChains().values()) {
             // match invocation chains
@@ -124,11 +113,17 @@
             }
             connect(inboundChain, outboundChain);
         }
-
         if (postProcessorRegistry != null) {
             // run wire post-processors
             postProcessorRegistry.process(sourceWire, targetWire);
         }
+        if (optimizable
+            && WireUtils.isOptimizable(sourceWire)
+            && WireUtils.isOptimizable(targetWire)) {
+            if (WireUtils.isOptimizable(sourceWire) && 
WireUtils.isOptimizable(targetWire)) {
+                sourceWire.setTargetWire(targetWire);
+            }
+        }
     }
 
     /**
@@ -152,18 +147,6 @@
             sourceWire.setTargetWire(targetWire);
             // system services do not need to have their chains processed, 
return
             return;
-        } else if (optimizable
-            && WireUtils.isOptimizable(sourceWire)
-            && WireUtils.isOptimizable(targetWire)) {
-            if (postProcessorRegistry != null) {
-                // run wire post-processors
-                postProcessorRegistry.process(sourceWire, targetWire);
-            }
-            if (WireUtils.isOptimizable(sourceWire) && 
WireUtils.isOptimizable(targetWire)) {
-                sourceWire.setOptimizable(true);
-                sourceWire.setTargetWire(targetWire);
-                // don not return yet, as invocation chains still need to be 
processed
-            }
         }
         // match outbound to inbound chains
         for (OutboundInvocationChain outboundChain : 
sourceWire.getInvocationChains().values()) {
@@ -301,6 +284,14 @@
             // run wire post-processors
             postProcessorRegistry.process(sourceWire, targetWire);
         }
+        if (optimizable
+            && WireUtils.isOptimizable(sourceWire)
+            && WireUtils.isOptimizable(targetWire)) {
+            if (WireUtils.isOptimizable(sourceWire) && 
WireUtils.isOptimizable(targetWire)) {
+                sourceWire.setOptimizable(true);
+                sourceWire.setTargetWire(targetWire);
+            }
+        }
     }
 
     /**
@@ -324,7 +315,7 @@
         } else {
             sourceChain.setTargetInterceptor(new 
SynchronousBridgingInterceptor(head));
         }
-        sourceChain.prepare(); 
+        sourceChain.prepare();
         sourceChain.setTargetInvoker(invoker);
     }
 

Modified: 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java?view=diff&rev=492478&r1=492477&r2=492478
==============================================================================
--- 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
 Thu Jan  4 01:41:50 2007
@@ -20,6 +20,7 @@
 
 import org.apache.tuscany.spi.component.AtomicComponent;
 import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.SCAObject;
 import org.apache.tuscany.spi.wire.InboundInvocationChain;
 import org.apache.tuscany.spi.wire.InboundWire;
 import org.apache.tuscany.spi.wire.Interceptor;
@@ -118,6 +119,15 @@
             connector.connect(inboundChain, outboundChain);
             fail();
         } catch (WireConnectException e) {
+            // expected
+        }
+    }
+
+    public void testInvalidConnectObject() throws Exception {
+        try {
+            connector.connect(EasyMock.createNiceMock(SCAObject.class));
+            fail();
+        } catch (AssertionError e) {
             // expected
         }
     }



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