Spring/spring-loaded
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix github#27: NPE in TypeRegistry.loadPropertiesConfiguration

Browse Source
This commit is contained in:
Andy Clement
2014-02-22 11:11:41 -08:00
parent ad6a825688
commit 658745a46b
1 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
springloaded/src/main/java/org/springsource/loaded/TypeRegistry.java
View File

@@ -494,33 +494,41 @@ public class TypeRegistry {
configuration = new Properties(GlobalConfiguration.globalConfigurationProperties);
try {
Set<String> configurationFiles = new HashSet<String>();
Enumeration<URL> resources = classLoader.get().getResources("springloaded.properties");
while (resources.hasMoreElements()) {
URL url = resources.nextElement();
String configFile = url.toString();
if (GlobalConfiguration.logging && log.isLoggable(Level.INFO)) {
log.log(Level.INFO, this.toString() + ": processing config file: " + url.toString());
ClassLoader classloader = classLoader.get();
Enumeration<URL> resources = classloader==null?null:classloader.getResources("springloaded.properties");
if (resources == null) {
if (GlobalConfiguration.verboseMode && log.isLoggable(Level.INFO)) {
log.info("Unable to load springloaded.properties, cannot find it through classloader "+classloader);
}
if (configurationFiles.contains(configFile)) {
continue;
}
configurationFiles.add(configFile);
InputStream is = url.openStream();
Properties p = new Properties();
p.load(is);
is.close();
Set<String> keys = p.stringPropertyNames();
for (String key : keys) {
if (!configuration.containsKey(key)) {
configuration.put(key, p.getProperty(key));
} else {
// Extend our configuration
String valueSoFar = configuration.getProperty(key);
StringBuilder sb = new StringBuilder(valueSoFar);
sb.append(",");
sb.append(p.getProperty(key));
configuration.put(key, sb.toString());
}
else {
while (resources.hasMoreElements()) {
URL url = resources.nextElement();
String configFile = url.toString();
if (GlobalConfiguration.logging && log.isLoggable(Level.INFO)) {
log.log(Level.INFO, this.toString() + ": processing config file: " + url.toString());
}
if (configurationFiles.contains(configFile)) {
continue;
}
configurationFiles.add(configFile);
InputStream is = url.openStream();
Properties p = new Properties();
p.load(is);
is.close();
Set<String> keys = p.stringPropertyNames();
for (String key : keys) {
if (!configuration.containsKey(key)) {
configuration.put(key, p.getProperty(key));
} else {
// Extend our configuration
String valueSoFar = configuration.getProperty(key);
StringBuilder sb = new StringBuilder(valueSoFar);
sb.append(",");
sb.append(p.getProperty(key));
configuration.put(key, sb.toString());
}
}
}
}