Author: felixk
Date: Wed Mar 23 20:38:44 2011
New Revision: 1084725
URL: http://svn.apache.org/viewvc?rev=1084725&view=rev
Log:
Avoid NPE and throw a controlled Exception
Modified:
james/mailbox-integration-tester/trunk/src/main/java/org/apache/james/imap/tester/base/FileProtocolSessionBuilder.java
Modified:
james/mailbox-integration-tester/trunk/src/main/java/org/apache/james/imap/tester/base/FileProtocolSessionBuilder.java
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/main/java/org/apache/james/imap/tester/base/FileProtocolSessionBuilder.java?rev=1084725&r1=1084724&r2=1084725&view=diff
==============================================================================
---
james/mailbox-integration-tester/trunk/src/main/java/org/apache/james/imap/tester/base/FileProtocolSessionBuilder.java
(original)
+++
james/mailbox-integration-tester/trunk/src/main/java/org/apache/james/imap/tester/base/FileProtocolSessionBuilder.java
Wed Mar 23 20:38:44 2011
@@ -129,6 +129,10 @@ public class FileProtocolSessionBuilder
List<String> unorderedLines = new ArrayList<String>(5);
next = reader.readLine();
+ if (next == null)
+ throw new Exception("Readline doesn't contain any
data, but must not be 'null' (linenumber="
+ + lineNumber);
+
while (!next.startsWith(CLOSE_UNORDERED_BLOCK_TAG)) {
if (!next.startsWith(SERVER_TAG)) {
throw new Exception(
@@ -138,6 +142,11 @@ public class FileProtocolSessionBuilder
unorderedLines.add(serverMsg);
next = reader.readLine();
lineNumber++;
+
+ if (next == null)
+ throw new Exception("Readline doesn't contain any
data, but must not be 'null' (linenumber="
+ + lineNumber);
+
}
session.SUB(sessionNumber, unorderedLines, location,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
