Author: kwall
Date: Tue Nov 24 18:20:23 2015
New Revision: 1716227
URL: http://svn.apache.org/viewvc?rev=1716227&view=rev
Log:
QPID-6889: [Java Broker] Prevent NPE during path validation when given name
does not have a parent portion
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java?rev=1716227&r1=1716226&r2=1716227&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
Tue Nov 24 18:20:23 2015
@@ -150,6 +150,7 @@ public class JsonFileConfigStore impleme
throw new StoreException("Cannot determine path for configuration
storage");
}
File fileFromSettings = new
File(configurationStoreSettings.getStorePath());
+ File parentFromSettings =
fileFromSettings.getAbsoluteFile().getParentFile();
boolean isFile = fileFromSettings.exists() &&
fileFromSettings.isFile();
if(!isFile)
{
@@ -165,14 +166,14 @@ public class JsonFileConfigStore impleme
{
isFile = true;
}
- else if((new File(fileFromSettings.getParent())).isDirectory() &&
fileFromSettings.getName().contains("."))
+ else if(parentFromSettings.isDirectory() &&
fileFromSettings.getName().contains("."))
{
isFile = true;
}
}
if(isFile)
{
- _directoryName = fileFromSettings.getParent();
+ _directoryName = parentFromSettings.getAbsolutePath();
_configFileName = fileFromSettings.getName();
_backupFileName = fileFromSettings.getName() + ".bak";
_tempFileName = fileFromSettings.getName() + ".tmp";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
