WINK-373 - Fix NPE when EntityType is null

lresende · lresende · commit a11e607f2aa9 · 2012-12-01T07:59:15.000Z
Patch provided by TERAJIMA Motoyuki git-svn-id: https://svn.apache.org/repos/asf/incubator/wink/trunk@1415943 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java b/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java
@@ -198,11 +198,12 @@ public <T> T invoke(String method, Class<T> responseEntity, Object requestEntity
 
     @SuppressWarnings("unchecked")
     public <T> T invoke(String method, EntityType<T> responseEntity, Object requestEntity) {
-        ClientResponse response =
-            invoke(method, responseEntity.getRawClass(), responseEntity.getType(), requestEntity);
         if (responseEntity == null) {
+            invoke(method, null, null, requestEntity);
             return null;
         }
+        ClientResponse response =
+            invoke(method, responseEntity.getRawClass(), responseEntity.getType(), requestEntity);
         if (ClientResponse.class.equals(responseEntity.getRawClass())) {
             return (T)response;
         }

Original file line number	Diff line number	Diff line change
`@@ -198,11 +198,12 @@ public <T> T invoke(String method, Class<T> responseEntity, Object requestEntity`
`198`	`198`
`199`	`199`	`@SuppressWarnings("unchecked")`
`200`	`200`	`public <T> T invoke(String method, EntityType<T> responseEntity, Object requestEntity) {`
`201`		`- ClientResponse response =`
`202`		`- invoke(method, responseEntity.getRawClass(), responseEntity.getType(), requestEntity);`
`203`	`201`	`if (responseEntity == null) {`
	`202`	`+ invoke(method, null, null, requestEntity);`
`204`	`203`	`return null;`
`205`	`204`	`}`
	`205`	`+ ClientResponse response =`
	`206`	`+ invoke(method, responseEntity.getRawClass(), responseEntity.getType(), requestEntity);`
`206`	`207`	`if (ClientResponse.class.equals(responseEntity.getRawClass())) {`
`207`	`208`	`return (T)response;`
`208`	`209`	`}`