Author: slaws
Date: Wed Oct 6 13:40:42 2010
New Revision: 1005031
URL: http://svn.apache.org/viewvc?rev=1005031&view=rev
Log:
TUSCANY-3696 - add more checking for null response.
Modified:
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
Modified:
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java?rev=1005031&r1=1005030&r2=1005031&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java
(original)
+++
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java
Wed Oct 6 13:40:42 2010
@@ -70,9 +70,12 @@ public class JSONPServlet extends Generi
@Override
public void service(ServletRequest servletRequest, ServletResponse
servletResponse) throws ServletException, IOException {
Object[] args = getJSONRequestStringArray(servletRequest);
- Object response = invokeService(args);
- String jsonResponse = getJSONResponseAsString(servletRequest,
response);
- servletResponse.getOutputStream().println(jsonResponse);
+ Object response = invokeService(args);
+
+ if (response != null){
+ String jsonResponse = getJSONResponseAsString(servletRequest,
response);
+ servletResponse.getOutputStream().println(jsonResponse);
+ }
}
/**
Modified:
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java?rev=1005031&r1=1005030&r2=1005031&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
(original)
+++
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
Wed Oct 6 13:40:42 2010
@@ -53,5 +53,9 @@ public class HelloWorldClient implements
public void sayHello7() {
ref.sayHello7();
- }
+ }
+
+ public void sayHello8(String name) {
+ ref.sayHello8(name);
+ }
}
Modified:
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java?rev=1005031&r1=1005030&r2=1005031&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
(original)
+++
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
Wed Oct 6 13:40:42 2010
@@ -68,4 +68,8 @@ public class HelloWorldImpl implements H
public void sayHello7() {
System.out.println("Hello void Fred");
}
+
+ public void sayHello8(String name) {
+ System.out.println("Hello void " + name);
+ }
}
Modified:
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java?rev=1005031&r1=1005030&r2=1005031&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
(original)
+++
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
Wed Oct 6 13:40:42 2010
@@ -37,5 +37,7 @@ public interface HelloWorldService {
String[] sayHello6(BeanA[] beans, String[] names, String anotherName);
void sayHello7();
+
+ void sayHello8(String name);
}
Modified:
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java?rev=1005031&r1=1005030&r2=1005031&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
(original)
+++
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
Wed Oct 6 13:40:42 2010
@@ -144,8 +144,23 @@ public class BindingTestCase {
public void testVoid() throws MalformedURLException, IOException {
HelloWorldService client =
((SCAClient)node).getService(HelloWorldService.class, "HelloWorldClient");
- client.sayHello7();
- }
+ try {
+ client.sayHello7();
+ } catch (Exception ex){
+ Assert.fail();
+ }
+ }
+
+ @Test
+ public void testVoidOut() throws MalformedURLException, IOException {
+ HelloWorldService client =
((SCAClient)node).getService(HelloWorldService.class, "HelloWorldClient");
+
+ try {
+ client.sayHello8("Fred");
+ } catch (Exception ex){
+ Assert.fail();
+ }
+ }
@Test
@Ignore
