TUSCANY-3005 - Take account of the case where there are either no input parameters or a void return type (or both). Thanks for the patch Kaushik.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@771740 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 23 insertions, 0 deletions

diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
index 87192fbad5..c7293b1180 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
+++ b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
@@ -48,5 +48,13 @@ public class HelloWorldReferenceImpl implements HelloWorldService {
                helloWorldService3.getPersonGreetings(person) + " " +
                helloWorldService4.getPersonGreetings(person);
     }
+    
+    public void nullInVoidOut() {
+        helloWorldService1.nullInVoidOut();  
+        helloWorldService2.nullInVoidOut();
+        helloWorldService3.nullInVoidOut();
+        helloWorldService4.nullInVoidOut();
+        
+    }
 }
 
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
index 7b9feda1f9..b6ebad2ac8 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
+++ b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
@@ -29,5 +29,7 @@ public interface HelloWorldService {
     public String getGreetings(String name);
     
     public String getPersonGreetings(Person person);
+    
+    public void nullInVoidOut();
 }
 
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
index 5c77cd9743..fd3ed4c736 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
+++ b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
@@ -19,6 +19,8 @@
 package org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld;
 
 public class HelloWorldServiceImpl implements HelloWorldService {
+    
+    public static int nullInVoidOutCalled = 0;
 
     public String getGreetings(String name){
         String response =  "Hello " + name;
@@ -31,5 +33,10 @@ public class HelloWorldServiceImpl implements HelloWorldService {
         System.out.println("getPersonGreetings: " + response);
         return response;
     }
+    
+    public void nullInVoidOut() {
+        System.out.println("nullInVoidOut");
+        nullInVoidOutCalled++;
+    }
 }
 
diff --git a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java b/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
index a83bfb758a..ba1fbcbab4 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
+++ b/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
@@ -21,12 +21,14 @@ package org.apache.tuscany.sca.binding.jms.format;
 import static org.junit.Assert.assertEquals;
 
 import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldService;
+import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl;
 import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.Person;
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCAContribution;
 import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.SCANodeFactory;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -57,6 +59,10 @@ public class FormatJMSDefaultTestCase {
         person.setFirstName("Fred");
         person.setLastName("Bloggs");
         assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getPersonGreetings(person));
+        
+        // this just makes sure that there are no exceptions thrown for this case
+        helloWorldService.nullInVoidOut();
+        Assert.assertEquals(4, HelloWorldServiceImpl.nullInVoidOutCalled);
     }
 
     @After