You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2007/01/04 10:48:24 UTC
svn commit: r492483 -
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
Author: jmarino
Date: Thu Jan 4 01:48:23 2007
New Revision: 492483
URL: http://svn.apache.org/viewvc?view=rev&rev=492483
Log:
cleanup double check
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=492483&r1=492482&r2=492483
==============================================================================
--- 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:48:23 2007
@@ -99,7 +99,6 @@
public void connect(InboundWire sourceWire, OutboundWire targetWire, boolean optimizable)
throws WiringException {
Map<Operation<?>, OutboundInvocationChain> targetChains = targetWire.getInvocationChains();
- // perform optimization, if possible
if (sourceWire.getContainer() != null && sourceWire.getContainer().isSystem()) {
sourceWire.setTargetWire(targetWire);
// system services do not need to have their chains processed, return
@@ -117,12 +116,11 @@
// run wire post-processors
postProcessorRegistry.process(sourceWire, targetWire);
}
+ // perform optimization, if possible
if (optimizable
&& WireUtils.isOptimizable(sourceWire)
&& WireUtils.isOptimizable(targetWire)) {
- if (WireUtils.isOptimizable(sourceWire) && WireUtils.isOptimizable(targetWire)) {
- sourceWire.setTargetWire(targetWire);
- }
+ sourceWire.setTargetWire(targetWire);
}
}
@@ -142,7 +140,6 @@
assert target != null;
ServiceContract contract = sourceWire.getServiceContract();
Map<Operation<?>, InboundInvocationChain> targetChains = targetWire.getInvocationChains();
- // perform optimization, if possible
if (sourceWire.getContainer() != null && sourceWire.getContainer().isSystem()) {
sourceWire.setTargetWire(targetWire);
// system services do not need to have their chains processed, return
@@ -284,13 +281,12 @@
// run wire post-processors
postProcessorRegistry.process(sourceWire, targetWire);
}
+ // perform optimization, if possible
if (optimizable
&& WireUtils.isOptimizable(sourceWire)
&& WireUtils.isOptimizable(targetWire)) {
- if (WireUtils.isOptimizable(sourceWire) && WireUtils.isOptimizable(targetWire)) {
- sourceWire.setOptimizable(true);
- sourceWire.setTargetWire(targetWire);
- }
+ sourceWire.setOptimizable(true);
+ sourceWire.setTargetWire(targetWire);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org