You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/09/06 17:33:28 UTC
svn commit: r1520606 - in /cxf/branches/2.7.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
Author: sergeyb
Date: Fri Sep 6 15:33:27 2013
New Revision: 1520606
URL: http://svn.apache.org/r1520606
Log:
Merged revisions 1520597 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1520597 | sergeyb | 2013-09-06 16:23:40 +0100 (Fri, 06 Sep 2013) | 1 line
[CXF-5135] Adding a missing NPE guard to AsyncInvokerImpl
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1520597
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java?rev=1520606&r1=1520605&r2=1520606&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java Fri Sep 6 15:33:27 2013
@@ -1423,22 +1423,30 @@ public class WebClient extends AbstractC
@Override
public <T> Future<T> method(String name, Entity<?> entity, Class<T> responseType) {
WebClient.this.setEntityHeaders(entity);
- return doInvokeAsync(name, entity.getEntity(), entity.getEntity().getClass(), null,
+ return doInvokeAsync(name,
+ entity == null ? null : entity.getEntity(),
+ entity == null ? null : entity.getEntity().getClass(),
+ null,
responseType, responseType, null);
}
@Override
public <T> Future<T> method(String name, Entity<?> entity, GenericType<T> responseType) {
WebClient.this.setEntityHeaders(entity);
- return doInvokeAsync(name, entity.getEntity(), entity.getEntity().getClass(), null,
+ return doInvokeAsync(name,
+ entity == null ? null : entity.getEntity(),
+ entity == null ? null : entity.getEntity().getClass(),
+ null,
responseType.getRawType(), responseType.getType(), null);
}
@Override
public <T> Future<T> method(String name, Entity<?> entity, InvocationCallback<T> callback) {
WebClient.this.setEntityHeaders(entity);
- return doInvokeAsyncCallback(name, entity.getEntity(), entity.getEntity().getClass(), null,
- callback);
+ return doInvokeAsyncCallback(name,
+ entity == null ? null : entity.getEntity(),
+ entity == null ? null : entity.getEntity().getClass(),
+ null, callback);
}
}
Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java?rev=1520606&r1=1520605&r2=1520606&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java Fri Sep 6 15:33:27 2013
@@ -338,7 +338,7 @@ public final class ResponseImpl extends
throw new MessageProcessingException(ex);
}
} else {
- throw new ResponseProcessingException(this, "No message body reader for class: " + cls, null);
+ throw new MessageProcessingException("No message body reader for class: " + cls);
}
}
throw new IllegalStateException("The entity is not backed by an input stream, entity class is : "