Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 944D4200AE3 for ; Wed, 4 May 2016 15:20:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 92FB1160A00; Wed, 4 May 2016 13:20:14 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B63571608F8 for ; Wed, 4 May 2016 15:20:13 +0200 (CEST) Received: (qmail 89044 invoked by uid 500); 4 May 2016 13:20:12 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 89035 invoked by uid 99); 4 May 2016 13:20:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 May 2016 13:20:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B9BAFDFC55; Wed, 4 May 2016 13:20:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-6891] Avoiding wrapping InputStream into PushBackInputStream in IOUtils.isEmpty Date: Wed, 4 May 2016 13:20:12 +0000 (UTC) archived-at: Wed, 04 May 2016 13:20:14 -0000 Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 5c5c11363 -> 986231dea [CXF-6891] Avoiding wrapping InputStream into PushBackInputStream in IOUtils.isEmpty Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/986231de Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/986231de Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/986231de Branch: refs/heads/3.1.x-fixes Commit: 986231deab7a335dfcc5c7ef19a721fa93591b03 Parents: 5c5c113 Author: Sergey Beryozkin Authored: Wed May 4 14:18:46 2016 +0100 Committer: Sergey Beryozkin Committed: Wed May 4 14:19:47 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/helpers/IOUtils.java | 19 +++++++++++++------ .../jaxrs/impl/ContainerRequestContextImpl.java | 8 ++++++++ .../provider/AbstractConfigurableProvider.java | 15 ++------------- .../org/apache/cxf/jaxrs/utils/HttpUtils.java | 16 ++++++++++++++++ 4 files changed, 39 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/986231de/core/src/main/java/org/apache/cxf/helpers/IOUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java index 194ee25..b14c96c 100644 --- a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java +++ b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java @@ -48,6 +48,15 @@ public final class IOUtils { if (is == null) { return true; } + try { + // if available is 0 it does not mean it is empty; it can also throw IOException + if (is.available() > 0) { + return false; + } + } catch (IOException ex) { + // ignore + } + final byte[] bytes = new byte[1]; try { if (is.markSupported()) { @@ -58,16 +67,14 @@ public final class IOUtils { is.reset(); } } - // if available is 0 it does not mean it is empty; it can also throw IOException - if (is.available() > 0) { - return false; - } } catch (IOException ex) { // ignore } + if (!(is instanceof PushbackInputStream)) { + return false; + } // it may be an attachment stream - PushbackInputStream pbStream = - is instanceof PushbackInputStream ? (PushbackInputStream)is : new PushbackInputStream(is); + PushbackInputStream pbStream = (PushbackInputStream)is; boolean isEmpty = isEof(pbStream.read(bytes)); if (!isEmpty) { pbStream.unread(bytes); http://git-wip-us.apache.org/repos/asf/cxf/blob/986231de/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java index 039b68c..9110e3e 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java @@ -68,6 +68,14 @@ public class ContainerRequestContextImpl extends AbstractRequestContextImpl @Override public boolean hasEntity() { + InputStream is = getEntityStream(); + if (is == null) { + return false; + } + // Is Content-Length is explicitly set to 0 ? + if (HttpUtils.isPayloadEmpty(getHeaders())) { + return false; + } try { return !IOUtils.isEmpty(getEntityStream()); } catch (IOException ex) { http://git-wip-us.apache.org/repos/asf/cxf/blob/986231de/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProvider.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProvider.java index ae201a6..90ce45b 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProvider.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProvider.java @@ -32,6 +32,7 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.common.i18n.BundleUtils; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.jaxrs.model.ClassResourceInfo; +import org.apache.cxf.jaxrs.utils.HttpUtils; public abstract class AbstractConfigurableProvider { protected static final ResourceBundle BUNDLE = BundleUtils.getBundle(AbstractJAXBProvider.class); @@ -163,19 +164,7 @@ public abstract class AbstractConfigurableProvider { } protected boolean isPayloadEmpty(MultivaluedMap headers) { - if (headers != null) { - String value = headers.getFirst(HttpHeaders.CONTENT_LENGTH); - if (value != null) { - try { - Long len = Long.valueOf(value); - return len <= 0; - } catch (NumberFormatException ex) { - // ignore - } - } - } - - return false; + return HttpUtils.isPayloadEmpty(headers); } protected void reportEmptyContentLength() throws NoContentException { String message = new org.apache.cxf.common.i18n.Message("EMPTY_BODY", BUNDLE).toString(); http://git-wip-us.apache.org/repos/asf/cxf/blob/986231de/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java index e945943..1aa2f6b 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java @@ -627,4 +627,20 @@ public final class HttpUtils { public static String toHttpLanguage(Locale locale) { return Headers.toHttpLanguage(locale); } + + public static boolean isPayloadEmpty(MultivaluedMap headers) { + if (headers != null) { + String value = headers.getFirst(HttpHeaders.CONTENT_LENGTH); + if (value != null) { + try { + Long len = Long.valueOf(value); + return len <= 0; + } catch (NumberFormatException ex) { + // ignore + } + } + } + + return false; + } }