svn commit: r771356 - /tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java

[rfeng]

Author: rfeng
Date: Mon May  4 16:44:57 2009
New Revision: 771356

URL: http://svn.apache.org/viewvc?rev=771356&view=rev
Log:
Merge the change from 1.x

Modified:
    
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
   (contents, props changed)

Modified: 
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java?rev=771356&r1=771355&r2=771356&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
 (original)
+++ 
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
 Mon May  4 16:44:57 2009
@@ -338,8 +338,19 @@
             throw new ServiceRuntimeException(cause);
         }
 
+        Map<String, Object> context = new HashMap<String, Object>();
+        if (metadata != null) {
+            context.putAll(metadata);
+        }
+        if (targetOperation != null) {
+            context.put(SOURCE_OPERATION, targetOperation);
+        }
+        if (sourceOperation != null) {
+            context.put(TARGET_OPERATION, sourceOperation);
+        }
+
         Object newResult =
-            transformException(result, targetDataType, sourceDataType, 
targetFaultType, sourceFaultType, metadata);
+            transformException(result, targetDataType, sourceDataType, 
targetFaultType, sourceFaultType, context);
 
         return newResult;
 
@@ -359,6 +370,9 @@
     }
 
     /**
+     * Assumes we're going from target-to-source, knowing that we're sending 
BACK an output response, rather than the more
+     * obvious source-to-target.
+     *
      * @param output
      * @param sourceOperation
      * @param targetOperation

Propchange: 
tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon May  4 16:44:57 2009
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java:671193
+/tuscany/branches/sca-java-1.x/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java:713805-714043,771345
+/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java:694816-713804