You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/04/16 08:48:24 UTC

svn commit: r529144 - /incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessor.java

Author: rfeng
Date: Sun Apr 15 23:48:23 2007
New Revision: 529144

URL: http://svn.apache.org/viewvc?view=rev&rev=529144
Log:
Fix the testing of transformation condition

Modified:
    incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessor.java

Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessor.java?view=diff&rev=529144&r1=529143&r2=529144
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingWirePostProcessor.java Sun Apr 15 23:48:23 2007
@@ -55,7 +55,15 @@
         if (source == target) {
             return false;
         }
-        return !source.getDataBinding().equals(target.getDataBinding());
+        String sourceDataBinding = source.getDataBinding();
+        String targetDataBinding = target.getDataBinding();
+        if (sourceDataBinding == targetDataBinding) {
+            return false;
+        }
+        if (sourceDataBinding == null || targetDataBinding == null) {
+            return true;
+        }
+        return !sourceDataBinding.equals(targetDataBinding);
     }
 
     public boolean isTransformationRequired(Operation source, Operation target) {
@@ -96,7 +104,7 @@
         if (sourceContract == targetContract) {
             return false;
         }
-        return true;
+        return isTransformationRequired(sourceOperation, targetOperation);
     }
 
     public void process(Wire wire) {



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org