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/02/14 18:51:21 UTC
svn commit: r507642 -
/incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaIDLUtils.java
Author: rfeng
Date: Wed Feb 14 09:51:20 2007
New Revision: 507642
URL: http://svn.apache.org/viewvc?view=rev&rev=507642
Log:
Fix a compiling error under IBM JDK (I assume it's a JDK bug)
C:\Tuscany\branches\sca-java-integration\sca\kernel\spi\src\main\java\org\apache
\tuscany\spi\idl\java\JavaIDLUtils.java:[78,84] inconvertible types
found : org.apache.tuscany.spi.model.ServiceContract<T>
required: org.apache.tuscany.spi.idl.java.JavaServiceContract
Modified:
incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaIDLUtils.java
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaIDLUtils.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaIDLUtils.java?view=diff&rev=507642&r1=507641&r2=507642
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaIDLUtils.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaIDLUtils.java Wed Feb 14 09:51:20 2007
@@ -24,6 +24,7 @@
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.Operation;
+import org.apache.tuscany.spi.model.ServiceContract;
/**
* Contains methods for mapping between an operation in a {@link org.apache.tuscany.spi.model.ServiceContract} and a
@@ -74,9 +75,12 @@
* @return true if the operation matches, false if does not
*/
private static <T> boolean match(Operation<T> operation, Method method) {
- // TODO: TUSCANY-1111, comparing different IDLs fail so use simple name matching
- if (operation.getServiceContract() != null && !(operation.getServiceContract() instanceof JavaServiceContract)) {
- return operation.getName().equals(method.getName());
+ // TODO: TUSCANY-1111, comparing different IDLs fail so use simple name
+ // matching
+ ServiceContract<T> contract = operation.getServiceContract();
+ if (contract != null && contract.isRemotable()) {
+ // No method overloading for remotable interfaces
+ return operation.getName().equals(method.getName());
}
Class<?>[] params = method.getParameterTypes();
DataType<List<DataType<T>>> inputType = operation.getInputType();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org