andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #318 from fredericBregier/3

Browse Source 
3 Issue #317 fix through this commit (addContent ignore initial content)
This commit is contained in:
Frédéric Brégier 2012-05-10 11:31:44 -07:00
commit 49142f36c8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/jboss/netty/handler/codec/http/MixedAttribute.java
View File

@ -64,7 +64,7 @@ public class MixedAttribute implements Attribute {
.getName()); .getName());
if (((MemoryAttribute) attribute).getChannelBuffer() != null) { if (((MemoryAttribute) attribute).getChannelBuffer() != null) {
diskAttribute.addContent(((MemoryAttribute) attribute) diskAttribute.addContent(((MemoryAttribute) attribute)
.getChannelBuffer(), true); .getChannelBuffer(), false);
} }
attribute = diskAttribute; attribute = diskAttribute;
} }

2
src/main/java/org/jboss/netty/handler/codec/http/MixedFileUpload.java
View File

@ -57,7 +57,7 @@ public class MixedFileUpload implements FileUpload {
definedSize); definedSize);
if (((MemoryFileUpload) fileUpload).getChannelBuffer() != null) { if (((MemoryFileUpload) fileUpload).getChannelBuffer() != null) {
diskFileUpload.addContent(((MemoryFileUpload) fileUpload) diskFileUpload.addContent(((MemoryFileUpload) fileUpload)
.getChannelBuffer(), true); .getChannelBuffer(), false);
} }
fileUpload = diskFileUpload; fileUpload = diskFileUpload;
} }