Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into jetty-9.1

This commit is contained in:
Jan Bartel 2013-10-28 18:01:43 +11:00
parent 9d756dc018 7818d2f0c6
commit f4e95be443
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartOutputStream.java
View File

@ -35,12 +35,12 @@ public class MultiPartOutputStream extends FilterOutputStream
private static final byte[] __CRLF={'\r','\n'}; private static final byte[] __CRLF={'\r','\n'};
private static final byte[] __DASHDASH={'-','-'}; private static final byte[] __DASHDASH={'-','-'};
public static String MULTIPART_MIXED="multipart/mixed"; public static final String MULTIPART_MIXED="multipart/mixed";
public static String MULTIPART_X_MIXED_REPLACE="multipart/x-mixed-replace"; public static final String MULTIPART_X_MIXED_REPLACE="multipart/x-mixed-replace";
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
private String boundary; private final String boundary;
private byte[] boundaryBytes; private final byte[] boundaryBytes;
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
private boolean inPart=false; private boolean inPart=false;
@ -54,8 +54,15 @@ public class MultiPartOutputStream extends FilterOutputStream
boundary = "jetty"+System.identityHashCode(this)+ boundary = "jetty"+System.identityHashCode(this)+
Long.toString(System.currentTimeMillis(),36); Long.toString(System.currentTimeMillis(),36);
boundaryBytes=boundary.getBytes(StringUtil.__ISO_8859_1); boundaryBytes=boundary.getBytes(StringUtil.__ISO_8859_1);
}
inPart=false; public MultiPartOutputStream(OutputStream out, String boundary)
throws IOException
{
super(out);
this.boundary = boundary;
boundaryBytes=boundary.getBytes(StringUtil.__ISO_8859_1);
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@ -66,14 +73,20 @@ public class MultiPartOutputStream extends FilterOutputStream
public void close() public void close()
throws IOException throws IOException
{ {
if (inPart) try
{
if (inPart)
out.write(__CRLF);
out.write(__DASHDASH);
out.write(boundaryBytes);
out.write(__DASHDASH);
out.write(__CRLF); out.write(__CRLF);
out.write(__DASHDASH); inPart=false;
out.write(boundaryBytes); }
out.write(__DASHDASH); finally
out.write(__CRLF); {
inPart=false; super.close();
super.close(); }
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */