cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1330966 - in /cxf/branches/2.3.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
Date Thu, 26 Apr 2012 16:56:14 GMT
Author: dkulp
Date: Thu Apr 26 16:56:14 2012
New Revision: 1330966

URL: http://svn.apache.org/viewvc?rev=1330966&view=rev
Log:
Merged revisions 1330958 via  svn merge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

........
  r1330958 | dkulp | 2012-04-26 12:51:51 -0400 (Thu, 26 Apr 2012) | 17 lines
  
  Merged revisions 1330951 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1330951 | dkulp | 2012-04-26 12:50:14 -0400 (Thu, 26 Apr 2012) | 9 lines
    
    Merged revisions 1330945 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1330945 | dkulp | 2012-04-26 12:47:28 -0400 (Thu, 26 Apr 2012) | 2 lines
    
      [CXF-4267] Put an NPE guard in AttachmentDataSource
    
    ........
  ........
  
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java?rev=1330966&r1=1330965&r2=1330966&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
Thu Apr 26 16:56:14 2012
@@ -60,7 +60,9 @@ public class AttachmentDataSource implem
         cache.holdTempFile();
     }
     public void release() {
-        cache.releaseTempFileHold();
+        if (cache != null) {
+            cache.releaseTempFileHold();
+        }
     }
     
     public String getContentType() {



Mime
View raw message