logging-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sde...@apache.org
Subject svn commit: r833948 - /logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
Date Mon, 09 Nov 2009 00:08:05 GMT
Author: sdeboy
Date: Mon Nov  9 00:08:05 2009
New Revision: 833948

URL: http://svn.apache.org/viewvc?rev=833948&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=833948&r1=833947&r2=833948&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
Mon Nov  9 00:08:05 2009
@@ -188,7 +188,10 @@
       setShowSplash(model.isShowSplash());
       setToolTipDisplayMillis(model.getToolTipDisplayMillis());
       setCyclicBufferSize(model.getCyclicBufferSize());
-      setConfigurationURLs(model.getConfigurationURLs());
+      Vector configurationURLs = model.getConfigurationURLs();
+      if (configurationURLs != null) {
+        setConfigurationURLs(model.getConfigurationURLs());
+      }
       setConfigurationURL(model.getConfigurationURL());
       setLastUsedVersion(model.getLastUsedVersion());
       setOkToRemoveSecurityManager(model.isOkToRemoveSecurityManager());



Mime
View raw message