Commitfb86b39

Stephane Landelle

committed

initializeBuffer takes byte[], make immutable members final

1 parentd124b53 commitfb86b39Copy full SHA for fb86b39

File tree

1 file changed

+22

-28

lines changed

src/main/java/com/ning/http/multipart
- MultipartBody.java

1 file changed

+22

-28

lines changed

`‎src/main/java/com/ning/http/multipart/MultipartBody.java‎`

Lines changed: 22 additions & 28 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,35 +32,28 @@`
`32`	`32`
`33`	`33`	`publicclassMultipartBodyimplementsRandomAccessBody {`
`34`	`34`
`35`		`-privatebyte[]boundary;`
`36`		`-privatelongcontentLength;`
`37`		`-privateList<com.ning.http.client.Part>parts;`
`38`		`-privateList<RandomAccessFile>files;`
`39`		`-privateintstartPart;`
`40`	`35`	`privatefinalstaticLoggerlogger =LoggerFactory.getLogger(MultipartBody.class);`
`41`		`-ByteArrayInputStreamcurrentStream;`
`42`		`-intcurrentStreamPosition;`
`43`		`-booleanendWritten;`
`44`		`-booleandoneWritingParts;`
`45`		`-FileLocationfileLocation;`
`46`		`-FilePartcurrentFilePart;`
`47`		`-FileChannelcurrentFileChannel;`
	`36`	`+`
	`37`	`+privatefinalbyte[]boundary;`
	`38`	`+privatefinallongcontentLength;`
	`39`	`+privatefinalList<com.ning.http.client.Part>parts;`
	`40`	`+privatefinalList<RandomAccessFile>files =newArrayList<RandomAccessFile>();`
	`41`	`+`
	`42`	`+privateintstartPart =0;`
	`43`	`+privateByteArrayInputStreamcurrentStream;`
	`44`	`+privateintcurrentStreamPosition = -1;`
	`45`	`+privatebooleanendWritten =false;`
	`46`	`+privatebooleandoneWritingParts =false;`
	`47`	`+privateFileLocationfileLocation =FileLocation.NONE;`
	`48`	`+privateFilePartcurrentFilePart;`
	`49`	`+privateFileChannelcurrentFileChannel;`
`48`	`50`
`49`	`51`	`enumFileLocation {NONE,START,MIDDLE,END}`
`50`	`52`
`51`	`53`	`publicMultipartBody(List<com.ning.http.client.Part>parts,StringcontentType,longcontentLength) {`
`52`	`54`	`this.boundary =MultipartEncodingUtil.getAsciiBytes(contentType.substring(contentType.indexOf("boundary=") +"boundary=".length()));`
`53`	`55`	`this.parts =parts;`
`54`	`56`	`this.contentLength =contentLength;`
`55`		`-`
`56`		`-files =newArrayList<RandomAccessFile>();`
`57`		`-`
`58`		`-startPart =0;`
`59`		`-currentStreamPosition = -1;`
`60`		`-endWritten =false;`
`61`		`-doneWritingParts =false;`
`62`		`-fileLocation =FileLocation.NONE;`
`63`		`-currentFilePart =null;`
`64`	`57`	`}`
`65`	`58`
`66`	`59`	`publicvoidclose()throwsIOException {`
`@@ -180,7 +173,7 @@ public long read(ByteBuffer buffer) throws IOException {`
`180`	`173`
`181`	`174`	`Part.sendMessageEnd(endWriter,boundary);`
`182`	`175`
`183`		`-initializeBuffer(endWriter);`
	`176`	`+initializeBuffer(endWriter.toByteArray());`
`184`	`177`	`}`
`185`	`178`
`186`	`179`	`if (currentStreamPosition > -1) {`
`@@ -207,7 +200,7 @@ private void initializeByteArrayBody(FilePart filePart)`
`207`	`200`	`ByteArrayOutputStreamoutput =newByteArrayOutputStream();`
`208`	`201`	`filePart.sendData(output);`
`209`	`202`
`210`		`-initializeBuffer(output);`
	`203`	`+initializeBuffer(output.toByteArray());`
`211`	`204`
`212`	`205`	`fileLocation =FileLocation.MIDDLE;`
`213`	`206`	`}`
`@@ -217,7 +210,7 @@ private void initializeFileEnd(FilePart currentPart)`
`217`	`210`
`218`	`211`	`ByteArrayOutputStreamoutput =generateFileEnd(currentPart);`
`219`	`212`
`220`		`-initializeBuffer(output);`
	`213`	`+initializeBuffer(output.toByteArray());`
`221`	`214`
`222`	`215`	`fileLocation =FileLocation.END;`
`223`	`216`
`@@ -238,6 +231,7 @@ private void initializeFileBody(FilePart currentPart)`
`238`	`231`	`currentFileChannel =raf.getChannel();`
`239`	`232`
`240`	`233`	`}else {`
	`234`	`+// ByteArrayPartSource`
`241`	`235`	`PartSourcepartSource =currentPart.getSource();`
`242`	`236`
`243`	`237`	`InputStreamstream =partSource.createInputStream();`
`@@ -261,7 +255,7 @@ private void initializeFilePart(FilePart filePart)`
`261`	`255`
`262`	`256`	`ByteArrayOutputStreamoutput =generateFileStart(filePart);`
`263`	`257`
`264`		`-initializeBuffer(output);`
	`258`	`+initializeBuffer(output.toByteArray());`
`265`	`259`
`266`	`260`	`fileLocation =FileLocation.START;`
`267`	`261`	`}`
`@@ -274,7 +268,7 @@ private void initializeStringPart(StringPart currentPart)`
`274`	`268`
`275`	`269`	`Part.sendPart(outputStream,currentPart,boundary);`
`276`	`270`
`277`		`-initializeBuffer(outputStream);`
	`271`	`+initializeBuffer(outputStream.toByteArray());`
`278`	`272`	`}`
`279`	`273`
`280`	`274`	`privateintwriteToBuffer(ByteBufferbuffer,intlength)`
`@@ -300,10 +294,10 @@ private int writeToBuffer(ByteBuffer buffer, int length)`
`300`	`294`	`returnwriteLength;`
`301`	`295`	`}`
`302`	`296`
`303`		`-privatevoidinitializeBuffer(ByteArrayOutputStreamoutputStream)`
	`297`	`+privatevoidinitializeBuffer(byte[]bytes)`
`304`	`298`	`throwsIOException {`
`305`	`299`
`306`		`-currentStream =newByteArrayInputStream(outputStream.toByteArray());`
	`300`	`+currentStream =newByteArrayInputStream(bytes);`
`307`	`301`
`308`	`302`	`currentStreamPosition =0;`
`309`	`303`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfb86b39

File tree

1 file changed

1 file changed

`‎src/main/java/com/ning/http/multipart/MultipartBody.java‎`

0 commit comments