You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/03/17 14:22:26 UTC
svn commit: r924280 - in /cxf/branches/2.2.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
Author: dkulp
Date: Wed Mar 17 13:22:26 2010
New Revision: 924280
URL: http://svn.apache.org/viewvc?rev=924280&view=rev
Log:
Merged revisions 924120 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r924120 | dkulp | 2010-03-16 23:05:27 -0400 (Tue, 16 Mar 2010) | 1 line
Fix a potential ClassCastException
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java?rev=924280&r1=924279&r2=924280&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java (original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java Wed Mar 17 13:22:26 2010
@@ -228,8 +228,10 @@ public class AttachmentDeserializer {
if (!ads.isCached()) {
ads.cache();
}
- } else {
+ } else if (s.getInputStream() instanceof DelegatingInputStream) {
cache((DelegatingInputStream) s.getInputStream(), false);
+ } else {
+ //assume a normal stream that is already cached
}
}
}