Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BC10C10FAF for ; Fri, 31 Jan 2014 18:24:58 +0000 (UTC) Received: (qmail 23257 invoked by uid 500); 31 Jan 2014 18:24:57 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 23147 invoked by uid 500); 31 Jan 2014 18:24:56 -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 23140 invoked by uid 99); 31 Jan 2014 18:24:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jan 2014 18:24:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jan 2014 18:24:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 81F4C23888D7; Fri, 31 Jan 2014 18:24:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1563198 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java Date: Fri, 31 Jan 2014 18:24:35 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140131182435.81F4C23888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Fri Jan 31 18:24:34 2014 New Revision: 1563198 URL: http://svn.apache.org/r1563198 Log: [CXF-5348] Preventing NPE Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java?rev=1563198&r1=1563197&r2=1563198&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java Fri Jan 31 18:24:34 2014 @@ -1003,7 +1003,7 @@ public abstract class ProviderFactory { Class actualType = InjectionUtils.getActualType(genericSuperType); if (expectedClass == actualType) { return new Type[]{genericSuperType}; - } else if (expectedClass.isAssignableFrom(actualType)) { + } else if (actualType != null && expectedClass.isAssignableFrom(actualType)) { return new Type[]{}; } }