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

This commit is contained in:
Greg Wilkins 2013-11-07 17:20:39 +11:00
commit b888b458ac
1 changed files with 11 additions and 1 deletions

View File

@ -41,13 +41,15 @@ public class GzipOutputStream extends DeflaterOutputStream
out.write(GZIP_HEADER); out.write(GZIP_HEADER);
} }
@Override
public synchronized void write(byte[] buf, int off, int len) throws IOException public synchronized void write(byte[] buf, int off, int len) throws IOException
{ {
super.write(buf,off,len); super.write(buf,off,len);
_crc.update(buf,off,len); _crc.update(buf,off,len);
} }
public void finish() throws IOException @Override
public synchronized void finish() throws IOException
{ {
if (!def.finished()) if (!def.finished())
{ {
@ -58,6 +60,14 @@ public class GzipOutputStream extends DeflaterOutputStream
out.write(trailer); out.write(trailer);
} }
} }
@Override
public synchronized void close() throws IOException
{
super.close();
}
private void writeInt(int i, byte[] buf, int offset) private void writeInt(int i, byte[] buf, int offset)
{ {