You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2009/09/30 13:03:19 UTC

svn commit: r820245 - in /james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver: SMTPHandler.java core/esmtp/StartTlsCmdHandler.java

Author: norman
Date: Wed Sep 30 11:03:19 2009
New Revision: 820245

URL: http://svn.apache.org/viewvc?rev=820245&view=rev
Log:
Correct method naming

Modified:
    james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
    james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/StartTlsCmdHandler.java

Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java?rev=820245&r1=820244&r2=820245&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java Wed Sep 30 11:03:19 2009
@@ -372,41 +372,71 @@
         }
     }
 
+    /**
+     * @see org.apache.james.socket.ProtocolHandler#fatalFailure(java.lang.RuntimeException, org.apache.james.socket.ProtocolContext)
+     */
 	public void fatalFailure(RuntimeException e, ProtocolContext context) {
 	}
 	
+	/**
+	 * @see org.apache.james.smtpserver.SMTPSession#getHelloName()
+	 */
     public String getHelloName() {
         return getConfigurationData().getHelloName();
     }
 
+    /**
+     * @see org.apache.james.smtpserver.SMTPSession#getMaxMessageSize()
+     */
     public long getMaxMessageSize() {
         return getConfigurationData().getMaxMessageSize();
     }
 
+    /**
+     * @see org.apache.james.smtpserver.SMTPSession#getSMTPGreeting()
+     */
     public String getSMTPGreeting() {
         return getConfigurationData().getSMTPGreeting();
     }
 
+    /**
+     * @see org.apache.james.smtpserver.SMTPSession#useAddressBracketsEnforcement()
+     */
     public boolean useAddressBracketsEnforcement() {
         return getConfigurationData().useAddressBracketsEnforcement();
     }
 
+    /**
+     * @see org.apache.james.smtpserver.SMTPSession#useHeloEhloEnforcement()
+     */
     public boolean useHeloEhloEnforcement() {
         return getConfigurationData().useAddressBracketsEnforcement();
     }
 
+    /**
+     * @see org.apache.james.smtpserver.SMTPSession#getLogger()
+     */
     public Log getLogger() {
         return context.getLogger();
     }
 
+    /**
+     * @see org.apache.james.socket.TLSSupportedSession#isTLSStarted()
+     */
 	public boolean isTLSStarted() {
 		return context.isSecure();
 	}
 
-	public void secure() throws IOException {
+	/**
+	 * @see org.apache.james.socket.TLSSupportedSession#startTLS()
+	 */
+	public void startTLS() throws IOException {
 		context.secure();
 	}
 
+	/**
+	 * @see org.apache.james.socket.TLSSupportedSession#isStartTLSSupported()
+	 */
 	public boolean isStartTLSSupported() {
 		return getConfigurationData().isStartTLSSupported();
 	}

Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/StartTlsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/StartTlsCmdHandler.java?rev=820245&r1=820244&r2=820245&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/StartTlsCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/StartTlsCmdHandler.java Wed Sep 30 11:03:19 2009
@@ -70,7 +70,7 @@
 				session.writeSMTPResponse(response);
 				try {
 					if (!session.isTLSStarted()) {
-						session.secure();
+						session.startTLS();
 						// force reset
 						session.resetState();
 					}



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