Repository: openmeetings Updated Branches: refs/heads/4.0.x d1fa138aa -> 659ee5764
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/659ee576 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/659ee576 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/659ee576 Branch: refs/heads/4.0.x Commit: 659ee5764659d69e5fa89d59fcdc8c2026376e9a Parents: d1fa138 Author: Maxim Solodovnik <[email protected]> Authored: Mon Nov 20 13:05:01 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Nov 20 13:05:01 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/db/dao/basic/ConfigurationDao.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/659ee576/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 b42231a..fbee826 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 @@ -220,11 +220,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> { public String getString(String key, String def) { Configuration c = get(key); - - if (c != null) { - return c.getValue() == null ? def : c.getValue(); - } - return def; + return c != null && c.getValue() != null ? c.getValue() : def; } @Override
