You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2018/10/22 07:29:57 UTC
[aries-jax-rs-whiteboard] 02/02: [ARIES-1852] Missing null check
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 16f3c9f9c3f494e7fc930294866291d863f7a750
Author: Carlos Sierra <cs...@apache.org>
AuthorDate: Mon Oct 22 09:02:39 2018 +0200
[ARIES-1852] Missing null check
---
.../jax/rs/whiteboard/internal/cxf/PromiseAwareJAXRSInvoker.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/PromiseAwareJAXRSInvoker.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/PromiseAwareJAXRSInvoker.java
index 91c091c..e71c2c0 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/PromiseAwareJAXRSInvoker.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/PromiseAwareJAXRSInvoker.java
@@ -30,7 +30,10 @@ public class PromiseAwareJAXRSInvoker extends JAXRSInvoker {
* natively just like a CompletionStage
*/
protected AsyncResponseImpl checkFutureResponse(Message inMessage, Object result) {
-
+ if (inMessage == null || result == null) {
+ return null;
+ }
+
// Fast path - do they share our view of the Promise
if (result instanceof Promise) {
return handlePromise(inMessage, (Promise<?>) result);