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 67E05200BD3 for ; Tue, 6 Dec 2016 12:10:55 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6670B160B1B; Tue, 6 Dec 2016 11:10:55 +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 AE0E3160B0C for ; Tue, 6 Dec 2016 12:10:54 +0100 (CET) Received: (qmail 24756 invoked by uid 500); 6 Dec 2016 11:10:53 -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 24747 invoked by uid 99); 6 Dec 2016 11:10:53 -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; Tue, 06 Dec 2016 11:10:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B2840E7DFC; Tue, 6 Dec 2016 11:10:53 +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-6882] Avoiding potential NPE Date: Tue, 6 Dec 2016 11:10:53 +0000 (UTC) archived-at: Tue, 06 Dec 2016 11:10:55 -0000 Repository: cxf Updated Branches: refs/heads/master 08e8316aa -> 7d344ae7e [CXF-6882] Avoiding potential NPE Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7d344ae7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7d344ae7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7d344ae7 Branch: refs/heads/master Commit: 7d344ae7ed882a4347d0f8775744646e0013aca5 Parents: 08e8316 Author: Sergey Beryozkin Authored: Tue Dec 6 11:10:37 2016 +0000 Committer: Sergey Beryozkin Committed: Tue Dec 6 11:10:37 2016 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/jaxrs/nio/NioMessageBodyWriter.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/7d344ae7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioMessageBodyWriter.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioMessageBodyWriter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioMessageBodyWriter.java index d4ab508..ac9f8ba 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioMessageBodyWriter.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/nio/NioMessageBodyWriter.java @@ -43,14 +43,14 @@ public class NioMessageBodyWriter implements MessageBodyWriter { @Override public boolean isWriteable(Class cls, Type type, Annotation[] anns, MediaType mt) { - return NioWriteEntity.class.isAssignableFrom(cls); + return NioWriteEntity.class.isAssignableFrom(cls) && getContinuationProvider() != null; } @Override public void writeTo(NioWriteEntity entity, Class cls, Type t, Annotation[] anns, MediaType mt, MultivaluedMap headers, OutputStream os) throws IOException, WebApplicationException { - Continuation cont = getContinuation(); + Continuation cont = getContinuationProvider().getContinuation(); NioWriteListenerImpl listener = new NioWriteListenerImpl(cont, entity, os); Message m = JAXRSUtils.getCurrentMessage(); m.put(WriteListener.class, listener); @@ -65,10 +65,8 @@ public class NioMessageBodyWriter implements MessageBodyWriter { MediaType mediaType) { return -1; } - private Continuation getContinuation() { - ContinuationProvider provider = - (ContinuationProvider)JAXRSUtils.getCurrentMessage().getExchange() + private ContinuationProvider getContinuationProvider() { + return (ContinuationProvider)JAXRSUtils.getCurrentMessage().getExchange() .getInMessage().get(ContinuationProvider.class.getName()); - return provider.getContinuation(); } }