cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1335897 - in /cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment: AttachmentUtil.java LazyDataSource.java
Date Wed, 09 May 2012 02:05:06 GMT
Author: dkulp
Date: Wed May  9 02:05:06 2012
New Revision: 1335897

URL: http://svn.apache.org/viewvc?rev=1335897&view=rev
Log:
Merged revisions 1335892 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1335892 | dkulp | 2012-05-08 21:55:31 -0400 (Tue, 08 May 2012) | 3 lines

  [CXF-4298, CXF-3505] Old fix for CXF-3505 not needed anymore as other
  fixes have made sure the streams are closed properly.

........

Modified:
    cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
    cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java

Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java?rev=1335897&r1=1335896&r2=1335897&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
Wed May  9 02:05:06 2012
@@ -333,10 +333,7 @@ public final class AttachmentUtil {
     }
 
     private static DataSource loadDataSource(String contentId, Collection<Attachment>
atts) {
-        LazyDataSource lazyDS =  new LazyDataSource(contentId, atts);
-        //ensure the attachment DS is loaded to make it also work with SUN's activation lib
-        lazyDS.getContentType();
-        return lazyDS;
+        return new LazyDataSource(contentId, atts);
     }
     
 }

Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java?rev=1335897&r1=1335896&r2=1335897&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
Wed May  9 02:05:06 2012
@@ -103,6 +103,8 @@ public class LazyDataSource implements D
     }
 
     public DataSource getDataSource() {
+        load();
+        
         return dataSource;
     }
 



Mime
View raw message