You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2013/02/26 05:14:36 UTC

svn commit: r1450014 - /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java

Author: vdegtyarev
Date: Tue Feb 26 04:14:36 2013
New Revision: 1450014

URL: http://svn.apache.org/r1450014
Log:
GetConfValue: Null pointer exception for default configuration value is fixed

Modified:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java?rev=1450014&r1=1450013&r2=1450014&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java Tue Feb 26 04:14:36 2013
@@ -124,8 +124,10 @@ public class ConfigurationDao implements
 			Configuration conf_reminder = get(confKey);
 
 			if (conf_reminder == null) {
-				log.warn("Could not find key in configuration CONF_KEY: "
-						+ confKey);
+				log.warn("Could not find key in configuration CONF_KEY: " + confKey);
+				if (defaultValue == null) {
+					return null;
+				}
 			} else {
 				// Use the custom value as default value
 				defaultValue = conf_reminder.getConf_value();