svn commit: r428770 - /james/server/sandbox/handlerapi2/src/java/org/apache/james/smtpserver/SMTPHandler.java

[norman]

Author: norman
Date: Fri Aug  4 09:35:52 2006
New Revision: 428770

URL: http://svn.apache.org/viewvc?rev=428770&view=rev
Log:
Fix nullpointer

Modified:
    
james/server/sandbox/handlerapi2/src/java/org/apache/james/smtpserver/SMTPHandler.java

Modified: 
james/server/sandbox/handlerapi2/src/java/org/apache/james/smtpserver/SMTPHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi2/src/java/org/apache/james/smtpserver/SMTPHandler.java?rev=428770&r1=428769&r2=428770&view=diff
==============================================================================
--- 
james/server/sandbox/handlerapi2/src/java/org/apache/james/smtpserver/SMTPHandler.java
 (original)
+++ 
james/server/sandbox/handlerapi2/src/java/org/apache/james/smtpserver/SMTPHandler.java
 Fri Aug  4 09:35:52 2006
@@ -266,13 +266,14 @@
        while (!sessionEnded) {
 
            process(readCommandLine());
-
+           
            if (response != null) {
                writeCompleteResponse(getSMTPResponse());
            }
 
            // handle messages
            if (mode == MESSAGE_RECEIVED_MODE) {
+               response = null;
                getLogger().debug("executing message handlers");
                List messageHandlers = handlerChain.getMessageHandlers();
 
@@ -326,6 +327,7 @@
        String cmdString = data;
        if (cmdString == null) {
            endSession();
+           return;
        }
        int spaceIndex = cmdString.indexOf(" ");
        if (spaceIndex > 0) {
@@ -341,6 +343,7 @@
        if (commandHandlers == null) {
            // end the session
            endSession();
+           return;
        } else {
            for (int i = 0; i < commandHandlers.size(); i++) {
                doChain = false;
@@ -381,7 +384,7 @@
                writeResponse(finalResponse);
            }
        }
-       resetSMTPResponse();
+       response = null;
 
        if (mode == COMMAND_MODE) {
            mode = RESPONSE_MODE;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]