moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2025-01-07 11:48:02 -05:00
Code Issues Releases Wiki Activity

Fix regression in AbstractConnection: return null instead of empty string on closed connection

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1179 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-07-13 07:07:29 +00:00
parent a702183d1a
commit 2cab4c6ded
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/davmail/AbstractConnection.java
View File

@ -52,7 +52,7 @@ public class AbstractConnection extends Thread {
} }
public String readLine() throws IOException { public String readLine() throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = null;
int b; int b;
while ((b = read()) > -1) { while ((b = read()) > -1) {
if (b == '\r') { if (b == '\r') {
@ -64,13 +64,21 @@ public class AbstractConnection extends Thread {
} else if (b == '\n') { } else if (b == '\n') {
break; break;
} }
if (baos == null) {
baos = new ByteArrayOutputStream();
}
baos.write(b); baos.write(b);
} }
return new String(baos.toByteArray(), encoding); if (baos != null) {
return new String(baos.toByteArray(), encoding);
} else {
return null;
}
} }
/** /**
* Read byteSize bytes from inputStream, return content as String. * Read byteSize bytes from inputStream, return content as String.
*
* @param byteSize content size * @param byteSize content size
* @return content * @return content
* @throws IOException on error * @throws IOException on error
@ -81,6 +89,7 @@ public class AbstractConnection extends Thread {
/** /**
* Read byteSize bytes from inputStream, return content as byte array. * Read byteSize bytes from inputStream, return content as byte array.
*
* @param byteSize content size * @param byteSize content size
* @return content * @return content
* @throws IOException on error * @throws IOException on error