Author: norman
Date: Mon May 31 14:19:07 2010
New Revision: 949751
URL: http://svn.apache.org/viewvc?rev=949751&view=rev
Log:
Next attempt to fix JAMES-1011
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java?rev=949751&r1=949750&r2=949751&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
Mon May 31 14:19:07 2010
@@ -241,10 +241,8 @@ public class AuthCmdHandler
// Authenticate user
SMTPResponse response = doAuthTest(session, user, pass, "PLAIN");
- // remove all pushed linehandlers
- for (int i = 0; i < session.getPushedLineHandlerCount(); i++) {
- session.popLineHandler();
- }
+ session.popLineHandler();
+
return response;
}
@@ -264,6 +262,9 @@ public class AuthCmdHandler
user = null;
}
}
+
+ session.popLineHandler();
+
session.pushLineHandler(new AbstractSMTPLineHandler() {
private String user;
@@ -291,14 +292,13 @@ public class AuthCmdHandler
pass = null;
}
}
+
+ session.popLineHandler();
+
// Authenticate user
SMTPResponse response = doAuthTest(session, user, pass, "LOGIN");
-
- // remove all pushed linehandlers
- for (int i = 0; i < session.getPushedLineHandlerCount(); i++) {
- session.popLineHandler();
- }
+
return response;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
