Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 00363e691 -> 58f40673e
[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/58f40673 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/58f40673 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/58f40673 Branch: refs/heads/3.0.x-fixes Commit: 58f40673ee9fcbebea144377827e7ba3b6242d21 Parents: 00363e6 Author: Sergey Beryozkin <[email protected]> Authored: Mon May 4 21:51:52 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Mon May 4 21:53:23 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/58f40673/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(); }
