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/14 03:11:15 UTC

svn commit: r528730 - in /incubator/tuscany/java/sca/modules: core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java interface-java/src/main/java/org/apache/tuscany/interfacedef/java/impl/JavaInterfaceUtil.java

Author: rfeng
Date: Fri Apr 13 18:11:14 2007
New Revision: 528730

URL: http://svn.apache.org/viewvc?view=rev&rev=528730
Log:
Fix NPE in the test case failure

Modified:
    incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java
    incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/interfacedef/java/impl/JavaInterfaceUtil.java

Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java?view=diff&rev=528730&r1=528729&r2=528730
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java Fri Apr 13 18:11:14 2007
@@ -25,6 +25,7 @@
 
 import org.apache.tuscany.interfacedef.Operation;
 import org.apache.tuscany.interfacedef.impl.OperationImpl;
+import org.apache.tuscany.interfacedef.java.impl.JavaInterfaceImpl;
 import org.apache.tuscany.spi.wire.ChainHolder;
 import org.apache.tuscany.spi.wire.InvocationChain;
 import org.apache.tuscany.spi.wire.Wire;
@@ -39,6 +40,7 @@
         Wire wire = new WireImpl();
         Operation op = new OperationImpl();
         op.setName("hello");
+        op.setInterface(new JavaInterfaceImpl());
         InvocationChain chain = new InvocationChainImpl(op);
         wire.addInvocationChain(chain);
         Map<Method, ChainHolder> chains = WireUtils.createInterfaceToWireMapping(Foo.class, wire);
@@ -50,6 +52,7 @@
         Wire wire = new WireImpl();
         Operation op = new OperationImpl();
         op.setName("goodbye");
+        op.setInterface(new JavaInterfaceImpl());
         InvocationChain chain = new InvocationChainImpl(op);
         wire.addInvocationChain(chain);
         try {

Modified: incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/interfacedef/java/impl/JavaInterfaceUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/interfacedef/java/impl/JavaInterfaceUtil.java?view=diff&rev=528730&r1=528729&r2=528730
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/interfacedef/java/impl/JavaInterfaceUtil.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/interfacedef/java/impl/JavaInterfaceUtil.java Fri Apr 13 18:11:14 2007
@@ -24,6 +24,7 @@
 import java.util.List;
 
 import org.apache.tuscany.interfacedef.DataType;
+import org.apache.tuscany.interfacedef.Interface;
 import org.apache.tuscany.interfacedef.Operation;
 
 /**
@@ -49,7 +50,8 @@
      */
     public static  Method findMethod(Class<?> implClass, Operation operation) throws NoSuchMethodException {
         String name = operation.getName();
-        if(operation.getInterface().isRemotable()) {
+        Interface interface1 = operation.getInterface();
+        if(interface1!=null && interface1.isRemotable()) {
             for(Method m: implClass.getMethods()) {
                 if(m.getName().equals(name)) {
                     return m;



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