Author: norman
Date: Sat Jan 14 16:07:30 2012
New Revision: 1231520

URL: http://svn.apache.org/viewvc?rev=1231520&view=rev
Log:
Correctly set the smtp greeting and software name. This is related to 
PROTOCOLS-88

Modified:
    
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java

Modified: 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java?rev=1231520&r1=1231519&r2=1231520&view=diff
==============================================================================
--- 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
 (original)
+++ 
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
 Sat Jan 14 16:07:30 2012
@@ -276,14 +276,12 @@ public class SMTPServer extends Abstract
 
         @Override
         public String getGreeting() {
-            // TODO Auto-generated method stub
-            return null;
+            return SMTPServer.this.smtpGreeting;
         }
 
         @Override
         public String getSoftwareName() {
-            // TODO Auto-generated method stub
-            return null;
+            return "JAMES SMTP Server ";
         }
 
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to