Author: orudyy
Date: Thu Nov 26 14:22:44 2015
New Revision: 1716673
URL: http://svn.apache.org/viewvc?rev=1716673&view=rev
Log:
QPID-6884: [Java Broker] Fix path validation problem when Logger is given a
filename without a directory portion
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1716204 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/logging/AppenderUtils.java
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:22:44 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
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204
/qpid/trunk/qpid:796646-796653
Modified:
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/AppenderUtils.java
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/AppenderUtils.java?rev=1716673&r1=1716672&r2=1716673&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/AppenderUtils.java
(original)
+++
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/AppenderUtils.java
Thu Nov 26 14:22:44 2015
@@ -97,7 +97,7 @@ public class AppenderUtils
static void validateLogFilePermissions(final File file)
{
- if ((file.exists() && (!file.isFile() || !file.canWrite())) ||
!file.getParentFile().canWrite())
+ if ((file.exists() && (!file.isFile() || !file.canWrite())) ||
!file.getAbsoluteFile().getParentFile().canWrite())
{
throw new IllegalConfigurationException(String.format("Do not have
the permissions to log to file '%s'.", file.getAbsolutePath()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
