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:55 UTC
[aries-jax-rs-whiteboard] branch master updated (843fd7a -> 16f3c9f)
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git.
from 843fd7a [ARIES-1842] Handle null returns
new 945d48e Update exported packages for the tests
new 16f3c9f [ARIES-1852] Missing null check
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
jax-rs.itests-fragment/bnd.bnd | 68 +++++++++++-----------
.../internal/cxf/PromiseAwareJAXRSInvoker.java | 5 +-
2 files changed, 38 insertions(+), 35 deletions(-)
[aries-jax-rs-whiteboard] 02/02: [ARIES-1852] Missing null check
Posted by cs...@apache.org.
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);
[aries-jax-rs-whiteboard] 01/02: Update exported packages for the
tests
Posted by cs...@apache.org.
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 945d48e26154562a9822741ad43eeaa3100a22d2
Author: Carlos Sierra <cs...@apache.org>
AuthorDate: Mon Oct 22 08:58:40 2018 +0200
Update exported packages for the tests
---
jax-rs.itests-fragment/bnd.bnd | 68 +++++++++++++++++++++---------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/jax-rs.itests-fragment/bnd.bnd b/jax-rs.itests-fragment/bnd.bnd
index 78c5a58..ca18f54 100644
--- a/jax-rs.itests-fragment/bnd.bnd
+++ b/jax-rs.itests-fragment/bnd.bnd
@@ -17,37 +17,37 @@
Fragment-Host: org.apache.aries.jax.rs.whiteboard
Export-Package:\
- org.apache.cxf;version="3.2.4",\
- org.apache.cxf.attachment;version="3.2.4",\
- org.apache.cxf.common.classloader;version="3.2.4",\
- org.apache.cxf.common.logging;version="3.2.4",\
- org.apache.cxf.common.jaxb;version="3.2.4",\
- org.apache.cxf.common.security;version="3.2.4",\
- org.apache.cxf.common.util;version="3.2.4",\
- org.apache.cxf.configuration.security;version="3.2.4",\
- org.apache.cxf.endpoint;version="3.2.4",\
- org.apache.cxf.helpers;version="3.2.4",\
- org.apache.cxf.interceptor;version="3.2.4",\
- org.apache.cxf.interceptor.security;version="3.2.4",\
- org.apache.cxf.io;version="3.2.4",\
- org.apache.cxf.jaxrs;version="3.2.4",\
- org.apache.cxf.jaxrs.ext;version="3.2.4",\
- org.apache.cxf.jaxrs.impl;version="3.2.4",\
- org.apache.cxf.jaxrs.model;version="3.2.4",\
- org.apache.cxf.jaxrs.provider;version="3.2.4",\
- org.apache.cxf.jaxrs.utils;version="3.2.4",\
- org.apache.cxf.jaxrs.utils.multipart;version="3.2.4",\
- org.apache.cxf.jaxrs.utils.schemas;version="3.2.4",\
- org.apache.cxf.message;version="3.2.4",\
- org.apache.cxf.phase;version="3.2.4",\
- org.apache.cxf.resource;version="3.2.4",\
- org.apache.cxf.security;version="3.2.4",\
- org.apache.cxf.security.transport;version="3.2.4",\
- org.apache.cxf.service.model;version="3.2.4",\
- org.apache.cxf.staxutils;version="3.2.4",\
- org.apache.cxf.staxutils.transform;version="3.2.4",\
- org.apache.cxf.transport.http.auth;version="3.2.4",\
- org.apache.cxf.helpers;version="3.2.4",\
- org.apache.cxf.helpers;version="3.2.4",\
- org.apache.cxf.helpers;version="3.2.4",\
- org.apache.cxf.common.util;version="3.2.4"
+ org.apache.cxf;version="3.2.5",\
+ org.apache.cxf.attachment;version="3.2.5",\
+ org.apache.cxf.common.classloader;version="3.2.5",\
+ org.apache.cxf.common.logging;version="3.2.5",\
+ org.apache.cxf.common.jaxb;version="3.2.5",\
+ org.apache.cxf.common.security;version="3.2.5",\
+ org.apache.cxf.common.util;version="3.2.5",\
+ org.apache.cxf.configuration.security;version="3.2.5",\
+ org.apache.cxf.endpoint;version="3.2.5",\
+ org.apache.cxf.helpers;version="3.2.5",\
+ org.apache.cxf.interceptor;version="3.2.5",\
+ org.apache.cxf.interceptor.security;version="3.2.5",\
+ org.apache.cxf.io;version="3.2.5",\
+ org.apache.cxf.jaxrs;version="3.2.5",\
+ org.apache.cxf.jaxrs.ext;version="3.2.5",\
+ org.apache.cxf.jaxrs.impl;version="3.2.5",\
+ org.apache.cxf.jaxrs.model;version="3.2.5",\
+ org.apache.cxf.jaxrs.provider;version="3.2.5",\
+ org.apache.cxf.jaxrs.utils;version="3.2.5",\
+ org.apache.cxf.jaxrs.utils.multipart;version="3.2.5",\
+ org.apache.cxf.jaxrs.utils.schemas;version="3.2.5",\
+ org.apache.cxf.message;version="3.2.5",\
+ org.apache.cxf.phase;version="3.2.5",\
+ org.apache.cxf.resource;version="3.2.5",\
+ org.apache.cxf.security;version="3.2.5",\
+ org.apache.cxf.security.transport;version="3.2.5",\
+ org.apache.cxf.service.model;version="3.2.5",\
+ org.apache.cxf.staxutils;version="3.2.5",\
+ org.apache.cxf.staxutils.transform;version="3.2.5",\
+ org.apache.cxf.transport.http.auth;version="3.2.5",\
+ org.apache.cxf.helpers;version="3.2.5",\
+ org.apache.cxf.helpers;version="3.2.5",\
+ org.apache.cxf.helpers;version="3.2.5",\
+ org.apache.cxf.common.util;version="3.2.5"