commit a11e607f2aa948a2fe3aca423efe08876fd574f9
author Luciano Resende <lresende@apache.org> Sat Dec 01 07:59:15 2012 +0000
committer Luciano Resende <lresende@apache.org> Sat Dec 01 07:59:15 2012 +0000
tree e752f26fa4ea74e879377aa82f6ea74861d66a70
parent b45debf851211f36e7841110a6c31fbc1fb5efa0

WINK-373 - Fix NPE when EntityType is null

Patch provided by TERAJIMA Motoyuki

git-svn-id: https://svn.apache.org/repos/asf/incubator/wink/trunk@1415943 13f79535-47bb-0310-9956-ffa450edef68

wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java

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
index 49c272e..2c63607 100644
--- 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 @@
 
     @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;
         }