diff options
2 files changed, 4 insertions, 2 deletions
diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java index 554caebf5f..13d5c54ee4 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java @@ -26,6 +26,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; @@ -113,7 +114,7 @@ public class GenericJDBCConfigurationStore extends AbstractJDBCConfigurationStor try { Map<String, String> providerAttributes = new HashMap<>(); - Set<String> providerAttributeNames = connectionProviderFactory.getProviderAttributeNames(); + Set<String> providerAttributeNames = new HashSet<String>(connectionProviderFactory.getProviderAttributeNames()); providerAttributeNames.retainAll(parent.getContextKeys(false)); for(String attr : providerAttributeNames) { diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java index 338ef52078..59e165acc2 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java @@ -27,6 +27,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -92,7 +93,7 @@ public class GenericJDBCMessageStore extends GenericAbstractJDBCMessageStore try { Map<String, String> providerAttributes = new HashMap<>(); - Set<String> providerAttributeNames = connectionProviderFactory.getProviderAttributeNames(); + Set<String> providerAttributeNames = new HashSet<String>(connectionProviderFactory.getProviderAttributeNames()); providerAttributeNames.retainAll(parent.getContextKeys(false)); for(String attr : providerAttributeNames) { |