You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/11/26 15:30:57 UTC
svn commit: r1716687 - in /qpid/java/branches/6.0.x: ./
broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java
Author: orudyy
Date: Thu Nov 26 14:30:56 2015
New Revision: 1716687
URL: http://svn.apache.org/viewvc?rev=1716687&view=rev
Log:
QPID-6898: [Java Broker] Fix entering relative path without parents for Derby VHN and VH
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1716461 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/util/FileHelper.java
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:30:56 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,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java?rev=1716687&r1=1716686&r2=1716687&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java (original)
+++ qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java Thu Nov 26 14:30:56 2015
@@ -133,7 +133,7 @@ public class FileHelper
public boolean isWritableDirectory(String path)
{
- File storePath = new File(path);
+ File storePath = new File(path).getAbsoluteFile();
if (storePath.exists())
{
if (!storePath.isDirectory())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org