This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch 3.1.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7785fa66801dc534634f6c0e1f34d954c68fd8bd Author: Freeman Fang <[email protected]> AuthorDate: Fri Oct 20 09:25:04 2017 +0800 [CXF-7532]some clean up (cherry picked from commit 2201d34986f6657cb3262e8c042cd440a1f89bb0) --- .../src/main/java/org/apache/cxf/io}/ReaderInputStream.java | 2 +- .../jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java | 6 ++++-- .../jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ReaderInputStream.java b/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java similarity index 99% rename from rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ReaderInputStream.java rename to core/src/main/java/org/apache/cxf/io/ReaderInputStream.java index c7b142e..dd4c533 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ReaderInputStream.java +++ b/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cxf.jaxrs.utils; +package org.apache.cxf.io; import java.io.IOException; import java.io.InputStream; diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java index 61b0b14..0300b18 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java @@ -54,11 +54,11 @@ import javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate; import javax.xml.stream.XMLStreamReader; import org.apache.cxf.helpers.IOUtils; +import org.apache.cxf.io.ReaderInputStream; import org.apache.cxf.jaxrs.provider.ProviderFactory; import org.apache.cxf.jaxrs.utils.HttpUtils; import org.apache.cxf.jaxrs.utils.InjectionUtils; import org.apache.cxf.jaxrs.utils.JAXRSUtils; -import org.apache.cxf.jaxrs.utils.ReaderInputStream; import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageUtils; @@ -356,7 +356,9 @@ public final class ResponseImpl extends Response { } else { Message inMessage = getResponseMessage(); Reader reader = inMessage.getContent(Reader.class); - entityStream = InputStream.class.cast(new ReaderInputStream(reader)); + if (reader != null) { + entityStream = InputStream.class.cast(new ReaderInputStream(reader)); + } } // we need to check for readers even if no IS is set - the readers may still do it diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java index 173ae80..eb5bba9 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java @@ -89,6 +89,7 @@ import org.apache.cxf.common.util.ReflectionUtil; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.interceptor.Fault; +import org.apache.cxf.io.ReaderInputStream; import org.apache.cxf.jaxrs.JAXRSServiceImpl; import org.apache.cxf.jaxrs.ext.ContextProvider; import org.apache.cxf.jaxrs.ext.DefaultMethod; @@ -834,9 +835,10 @@ public final class JAXRSUtils { throws IOException, WebApplicationException { InputStream is = message.getContent(InputStream.class); if (is == null) { - //may use the jms transport so check the Reader; Reader reader = message.getContent(Reader.class); - is = new ReaderInputStream(reader); + if (reader != null) { + is = new ReaderInputStream(reader); + } } if (parameter.getType() == ParameterType.REQUEST_BODY) { -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
