Author: rfeng
Date: Mon Jan 14 11:58:54 2008
New Revision: 611909
URL: http://svn.apache.org/viewvc?rev=611909&view=rev
Log:
Merge the fix from trunk for TUSCANY-1978
Added:
incubator/tuscany/branches/sca-java-1.1/demos/xml-bigbank/build.xml
- copied unchanged from r611907,
incubator/tuscany/java/sca/demos/xml-bigbank/build.xml
Modified:
incubator/tuscany/branches/sca-java-1.1/demos/xml-bigbank/pom.xml
incubator/tuscany/branches/sca-java-1.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
Modified: incubator/tuscany/branches/sca-java-1.1/demos/xml-bigbank/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/demos/xml-bigbank/pom.xml?rev=611909&r1=611908&r2=611909&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/demos/xml-bigbank/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.1/demos/xml-bigbank/pom.xml Mon Jan
14 11:58:54 2008
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -106,14 +106,15 @@
<execution>
<configuration>
<mainClass>bigbank.BigBankClient</mainClass>
- </configuration>
+
<buildDependencyFileOnly>true</buildDependencyFileOnly>
+ </configuration>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
</build>
Modified:
incubator/tuscany/branches/sca-java-1.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java?rev=611909&r1=611908&r2=611909&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
(original)
+++
incubator/tuscany/branches/sca-java-1.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
Mon Jan 14 11:58:54 2008
@@ -138,7 +138,11 @@
if (dataBinding == null) {
DataType<?> dataType = dataBindings.introspectType(data);
if (dataType != null) {
- dataBinding =
dataBindings.getDataBinding(dataType.getDataBinding());
+ String db = dataType.getDataBinding();
+ dataBinding = dataBindings.getDataBinding(db);
+ if (dataBinding == null && db != null) {
+ return data;
+ }
}
if (dataBinding == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
