Author: rgodfrey
Date: Tue Jun 2 10:55:03 2015
New Revision: 1683074
URL: http://svn.apache.org/r1683074
Log:
QPID-6565 : Change logic for determining whether a store path is intended to be
the containing directory, or the file for the Json config
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.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=1683074&r1=1683073&r2=1683074&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 Jun 2 10:55:03 2015
@@ -150,7 +150,27 @@ public class JsonFileConfigStore impleme
throw new StoreException("Cannot determine path for configuration
storage");
}
File fileFromSettings = new
File(configurationStoreSettings.getStorePath());
- if(fileFromSettings.isFile() || (!fileFromSettings.exists() && (new
File(fileFromSettings.getParent())).isDirectory()))
+ boolean isFile = fileFromSettings.exists() &&
fileFromSettings.isFile();
+ if(!isFile)
+ {
+ if(fileFromSettings.exists())
+ {
+ isFile = false;
+ }
+ else if(fileFromSettings.getName().endsWith(File.separator))
+ {
+ isFile = false;
+ }
+ else if(fileFromSettings.getName().endsWith(".json"))
+ {
+ isFile = true;
+ }
+ else if((new File(fileFromSettings.getParent())).isDirectory() &&
fileFromSettings.getName().contains("."))
+ {
+ isFile = true;
+ }
+ }
+ if(isFile)
{
_directoryName = fileFromSettings.getParent();
_configFileName = fileFromSettings.getName();
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java?rev=1683074&r1=1683073&r2=1683074&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java
Tue Jun 2 10:55:03 2015
@@ -26,6 +26,6 @@ public interface JsonVirtualHostNode<X e
String STORE_PATH = "storePath";
- @ManagedAttribute(mandatory = true, defaultValue =
"${qpid.work_dir}${file.separator}${this:name}${file.separator}config")
+ @ManagedAttribute(mandatory = true, defaultValue =
"${qpid.work_dir}${file.separator}${this:name}${file.separator}config${file.separator}")
String getStorePath();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
