hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 23:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow NPE if getProperties(String) called before any module properties have been loaded.

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6957 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Mark Wood
2012-03-01 20:01:23 +00:00
parent b49e6bafff
commit 8e430dc6cf
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dspace-api/src/main/java/org/dspace/core/ConfigurationManager.java
View File

@@ -58,7 +58,7 @@ public class ConfigurationManager
private static Properties properties = null; private static Properties properties = null;
/** module configuration properties */ /** module configuration properties */
private static Map<String, Properties> moduleProps = null; private static Map<String, Properties> moduleProps = new HashMap<String, Properties>();
/** The default license */ /** The default license */
private static String license; private static String license;
@@ -148,7 +148,10 @@ public class ConfigurationManager
private static Properties getMutableProperties(String module) private static Properties getMutableProperties(String module)
{ {
Properties retProps = (module != null) ? moduleProps.get(module) : properties; if (module == null)
return properties;
Properties retProps = moduleProps.get(module);
if (retProps == null) if (retProps == null)
{ {
loadModuleConfig(module); loadModuleConfig(module);
@@ -419,7 +422,7 @@ public class ConfigurationManager
fatal("Can't load configuration", e); fatal("Can't load configuration", e);
// FIXME: Maybe something more graceful here, but with the // FIXME: Maybe something more graceful here, but with the
// configuration we can't do anything // configuration we can't do anything
throw new IllegalStateException("Failed to read default license.", e); throw new IllegalStateException("Failed to read default license.", e);
} }
finally finally
@@ -917,7 +920,6 @@ public class ConfigurationManager
else else
{ {
properties = new Properties(); properties = new Properties();
moduleProps = new HashMap<String, Properties>();
is = url.openStream(); is = url.openStream();
properties.load(is); properties.load(is);