qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1716607 - /qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java
Date Thu, 26 Nov 2015 11:26:43 GMT
Author: kwall
Date: Thu Nov 26 11:26:43 2015
New Revision: 1716607

URL: http://svn.apache.org/viewvc?rev=1716607&view=rev
Log:
QPID-6914: Prevent NPE within AESKeyFileEncrypter when a relative path is used without parent

Modified:
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java?rev=1716607&r1=1716606&r2=1716607&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java
(original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java
Thu Nov 26 11:26:43 2015
@@ -297,7 +297,7 @@ public class AESKeyFileEncrypterFactory
 
     private void createEmptyKeyFile(File file) throws IOException
     {
-        final Path parentFilePath = file.getParentFile().toPath();
+        final Path parentFilePath = file.getAbsoluteFile().getParentFile().toPath();
 
         if(isPosixFileSystem(file)) {
             Set<PosixFilePermission> ownerOnly = EnumSet.of(PosixFilePermission.OWNER_READ,



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message