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 A797E9E0B for ; Thu, 26 Apr 2012 16:47:49 +0000 (UTC) Received: (qmail 61544 invoked by uid 500); 26 Apr 2012 16:47:49 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 61506 invoked by uid 500); 26 Apr 2012 16:47:49 -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 61499 invoked by uid 99); 26 Apr 2012 16:47:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Apr 2012 16:47:49 +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; Thu, 26 Apr 2012 16:47:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 89A63238890B; Thu, 26 Apr 2012 16:47:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1330945 - /cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java Date: Thu, 26 Apr 2012 16:47:28 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120426164728.89A63238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Apr 26 16:47:28 2012 New Revision: 1330945 URL: http://svn.apache.org/viewvc?rev=1330945&view=rev Log: [CXF-4267] Put an NPE guard in AttachmentDataSource Modified: cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java Modified: cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java?rev=1330945&r1=1330944&r2=1330945&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java Thu Apr 26 16:47:28 2012 @@ -62,7 +62,9 @@ public class AttachmentDataSource implem cache.holdTempFile(); } public void release() { - cache.releaseTempFileHold(); + if (cache != null) { + cache.releaseTempFileHold(); + } } public String getContentType() {