So far all junit tests now pass.. Thx Stefano. Its now possible to push a new IOState if needed. Now we have to modify the AuthCmdHandler and DataCmdHandler to work with the IOState so we can remove the direct IO access completly from the Handlers ;-)
So plz review.. bye Norman Am Freitag, den 04.08.2006, 16:41 +0000 schrieb [EMAIL PROTECTED]: > Author: bago > Date: Fri Aug 4 09:41:07 2006 > New Revision: 428773 > > URL: http://svn.apache.org/viewvc?rev=428773&view=rev > Log: > Revert previous commit (the client was correctly waiting). > Remove duplicate DATA from DataCmdHandler > > Modified: > > james/server/sandbox/handlerapi2/src/java/org/apache/james/smtpserver/core/DataCmdHandler.java > > james/server/sandbox/handlerapi2/src/test/org/apache/james/smtpserver/SMTPServerTest.java > > Modified: > james/server/sandbox/handlerapi2/src/java/org/apache/james/smtpserver/core/DataCmdHandler.java > URL: > http://svn.apache.org/viewvc/james/server/sandbox/handlerapi2/src/java/org/apache/james/smtpserver/core/DataCmdHandler.java?rev=428773&r1=428772&r2=428773&view=diff > ============================================================================== > --- > james/server/sandbox/handlerapi2/src/java/org/apache/james/smtpserver/core/DataCmdHandler.java > (original) > +++ > james/server/sandbox/handlerapi2/src/java/org/apache/james/smtpserver/core/DataCmdHandler.java > Fri Aug 4 09:41:07 2006 > @@ -102,7 +102,7 @@ > String responseString = null; > responseString = "354 Ok Send data ending with <CRLF>.<CRLF>"; > session.writeResponse(responseString); > - session.getSMTPResponse().setRawSMTPResponse(responseString); > + //session.getSMTPResponse().setRawSMTPResponse(responseString); > InputStream msgIn = new CharTerminatedInputStream(session > .getInputStream(), SMTPTerminator); > try { > > Modified: > james/server/sandbox/handlerapi2/src/test/org/apache/james/smtpserver/SMTPServerTest.java > URL: > http://svn.apache.org/viewvc/james/server/sandbox/handlerapi2/src/test/org/apache/james/smtpserver/SMTPServerTest.java?rev=428773&r1=428772&r2=428773&view=diff > ============================================================================== > --- > james/server/sandbox/handlerapi2/src/test/org/apache/james/smtpserver/SMTPServerTest.java > (original) > +++ > james/server/sandbox/handlerapi2/src/test/org/apache/james/smtpserver/SMTPServerTest.java > Fri Aug 4 09:41:07 2006 > @@ -306,12 +306,10 @@ > smtpProtocol2.addRecipient(recipient2); > > smtpProtocol1.sendShortMessageData("Subject: test\r\n\r\nTest > body\r\n.\r\n"); > - smtpProtocol1.completePendingCommand(); > > verifyLastMail(sender1, recipient1, null); > > smtpProtocol2.sendShortMessageData("Subject: test\r\n\r\nTest > body\r\n.\r\n"); > - smtpProtocol2.completePendingCommand(); > > verifyLastMail(sender2, recipient2, null); > > @@ -341,7 +339,6 @@ > smtpProtocol1.addRecipient(recipient1); > > smtpProtocol1.sendShortMessageData("Subject: test\r\n\r\nTest > body\r\n"); > - smtpProtocol1.completePendingCommand(); > verifyLastMail(sender1, recipient1, null); > > String sender2 = "[EMAIL PROTECTED]"; > @@ -350,7 +347,6 @@ > smtpProtocol1.addRecipient(recipient2); > > smtpProtocol1.sendShortMessageData("Subject: test2\r\n\r\nTest > body2\r\n"); > - smtpProtocol1.completePendingCommand(); > verifyLastMail(sender2, recipient2, null); > > smtpProtocol1.quit(); > @@ -823,7 +819,6 @@ > > smtpProtocol.addRecipient("[EMAIL PROTECTED]"); > smtpProtocol.sendShortMessageData("Subject: test\r\n\r\nTest > body\r\n"); > - smtpProtocol.completePendingCommand(); > > smtpProtocol.quit(); > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > !EXCUBATOR:1,44d378bb43381387393271!
signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil