From d86de667d6b7aa3e579b28869167abd9e6b355a9 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Wed, 26 Nov 2014 07:31:14 +0000 Subject: QPID-6242: [Java Broker] Avoid "collection is empty" on Windows 7 if the newly created .keys directory has empty initial permission set git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1641770 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/security/encryption/AESKeyFileEncrypterFactory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/java') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java index a46f95c248..d4bbab9244 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java @@ -40,6 +40,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.EnumSet; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.ListIterator; @@ -291,7 +292,7 @@ public class AESKeyFileEncrypterFactory implements ConfigurationSecretEncrypterF { found = true; AclEntry.Builder builder = AclEntry.newBuilder(acl); - Set permissions = EnumSet.copyOf(acl.permissions()); + Set permissions = acl.permissions().isEmpty() ? new HashSet() : EnumSet.copyOf(acl.permissions()); permissions.addAll(Arrays.asList(AclEntryPermission.ADD_FILE, AclEntryPermission.ADD_SUBDIRECTORY, AclEntryPermission.LIST_DIRECTORY)); builder.setPermissions(permissions); iter.set(builder.build()); -- cgit v1.2.1