Author: fdesbois Date: 2012-03-22 11:38:29 +0100 (Thu, 22 Mar 2012) New Revision: 3198 Url: http://chorem.org/repositories/revision/pollen/3198 Log: Improve error for applicationUrl not defined Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-03-22 10:38:24 UTC (rev 3197) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-03-22 10:38:29 UTC (rev 3198) @@ -24,6 +24,7 @@ package org.chorem.pollen; import com.google.common.base.Preconditions; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -85,9 +86,10 @@ "Could not parse configuration", e); } - // check application url is ok - URL applicationUrl = getApplicationUrl(); - if (applicationUrl == null) { + // application url is a mandatory property + String applicationUrl = + applicationConfig.getOption(PollenConfigurationOption.APPLICATION_URL.key); + if (StringUtils.isBlank(applicationUrl)) { throw new IllegalStateException( "No application url defined in configuration, please fill the property '" + PollenConfigurationOption.APPLICATION_URL.key + "'");