Author: sdeboy
Date: Wed Nov 11 05:59:01 2009
New Revision: 834774
URL: http://svn.apache.org/viewvc?rev=834774&view=rev
Log:
Don't set a null configurationURL vector if one wasn't found in the existing
configuration (will cause the related model to trigger an NPE on construction)
Modified:
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
Modified:
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java?rev=834774&r1=834773&r2=834774&view=diff
==============================================================================
---
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
(original)
+++
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
Wed Nov 11 05:59:01 2009
@@ -190,7 +190,7 @@
setCyclicBufferSize(model.getCyclicBufferSize());
Vector configurationURLs = model.getConfigurationURLs();
if (configurationURLs != null) {
- setConfigurationURLs(model.getConfigurationURLs());
+ setConfigurationURLs(configurationURLs);
}
setConfigurationURL(model.getConfigurationURL());
setLastUsedVersion(model.getLastUsedVersion());
@@ -246,7 +246,9 @@
}
public void setConfigurationURLs(Vector urls) {
- configurationURLs = urls;
+ if (urls != null) {
+ configurationURLs = urls;
+ }
}
/**
