Repository: cxf Updated Branches: refs/heads/master 3913cbf50 -> 9469be2de
[CXF-6388] Rethrowing NPE from AsyncResponseImpl, patch from Iris Ding applied Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9469be2d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9469be2d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9469be2d Branch: refs/heads/master Commit: 9469be2decdf115f4fe6b16e0d1465a62da8dc07 Parents: 3913cbf Author: Sergey Beryozkin <[email protected]> Authored: Mon May 4 21:51:52 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Mon May 4 21:51:52 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9469be2d/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java index fc997ad..c21e528 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java @@ -176,6 +176,8 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback { extraCallbacks[i] = callbacks[i].newInstance(); } return register(callback.newInstance(), extraCallbacks); + } catch (NullPointerException e) { + throw e; } catch (Throwable t) { return Collections.emptyMap(); }
