Author: norman
Date: Sun Dec 26 17:36:17 2010
New Revision: 1052919
URL: http://svn.apache.org/viewvc?rev=1052919&view=rev
Log:
Make sure helloName configuration get parsed correctly. See JAMES-1155
Modified:
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/netty/AbstractConfigurableAsyncServer.java
Modified:
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/netty/AbstractConfigurableAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/nio-netty/src/main/java/org/apache/james/server/netty/AbstractConfigurableAsyncServer.java?rev=1052919&r1=1052918&r2=1052919&view=diff
==============================================================================
---
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/netty/AbstractConfigurableAsyncServer.java
(original)
+++
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/netty/AbstractConfigurableAsyncServer.java
Sun Dec 26 17:36:17 2010
@@ -308,8 +308,9 @@ public abstract class AbstractConfigurab
* Configure the helloName for the given Configuration
*
* @param handlerConfiguration
+ * @throws ConfigurationException
*/
- protected void configureHelloName(Configuration handlerConfiguration) {
+ protected void configureHelloName(Configuration handlerConfiguration)
throws ConfigurationException {
StringBuilder infoBuffer;
String hostName = null;
try {
@@ -329,8 +330,10 @@ public abstract class AbstractConfigurab
if (autodetect) {
helloName = hostName;
} else {
- // Should we use the defaultdomain here ?
- helloName = handlerConfiguration.getString(HELLO_NAME +
".localhost");
+ helloName = handlerConfiguration.getString(HELLO_NAME);
+ if (helloName == null || helloName.trim().length() < 1) {
+ throw new ConfigurationException("Please configure the
helloName or use autodetect");
+ }
}
infoBuffer =
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
