Author: orudyy
Date: Thu Nov 26 14:23:28 2015
New Revision: 1716676
URL: http://svn.apache.org/viewvc?rev=1716676&view=rev
Log:
QPID-6889: [Java Broker] Prevent NPE during path validation when given name
does not have a parent portion
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1716227 https://svn.apache.org/repos/asf/qpid/java/trunk
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:23:28 2015
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227
/qpid/trunk/qpid:796646-796653
Modified:
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java?rev=1716676&r1=1716675&r2=1716676&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
(original)
+++
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
Thu Nov 26 14:23:28 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]
