You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/11/20 05:49:11 UTC
openmeetings git commit: no jira: possible NPE is fixed
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x b50a07bf4 -> d1fa138aa
no jira: possible NPE is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d1fa138a
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d1fa138a
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d1fa138a
Branch: refs/heads/4.0.x
Commit: d1fa138aa3f966408930ba1bd43b5aa916ab7ae9
Parents: b50a07b
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Nov 20 12:49:02 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Nov 20 12:49:02 2017 +0700
----------------------------------------------------------------------
.../org/apache/openmeetings/db/dao/basic/ConfigurationDao.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1fa138a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index 6f947e8..b42231a 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -222,7 +222,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
Configuration c = get(key);
if (c != null) {
- return c.getValue();
+ return c.getValue() == null ? def : c.getValue();
}
return def;
}