RCS file: /home/cvspublic/james-server/src/java/org/apache/james/smtpserver/SMTPHandler.java,v
retrieving revision 1.55
diff -u -r1.55 SMTPHandler.java
--- SMTPHandler.java	21 Feb 2004 23:15:31 -0000	1.55
+++ SMTPHandler.java	30 Mar 2004 13:12:20 -0000
@@ -178,7 +178,7 @@
      * The mail attribute holding the SMTP AUTH user name, if any.
      */
     private final static String SMTP_AUTH_USER_ATTRIBUTE_NAME = "org.apache.james.SMTPAuthUser";
-    
+
     /**
      * The thread executing this handler
      */
@@ -580,7 +580,7 @@
     private boolean parseCommand(String command) throws Exception {
         String argument = null;
         boolean returnValue = true;
-        
+
 
         if (command == null) {
             return false;
@@ -1324,7 +1324,7 @@
             headers.setHeader(RFC2822Headers.FROM, state.get(SENDER).toString());
         }
         // Determine the Return-Path
-        String returnPath = headers.getHeader(RFC2822Headers.RETURN_PATH, "\r\n");
+        String returnPath = headers.getHeader(RFC2822Headers.RETURN_PATH, null);
         headers.removeHeader(RFC2822Headers.RETURN_PATH);
         StringBuffer headerLineBuffer = new StringBuffer(512);
         if (returnPath == null) {