You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/05/03 15:22:46 UTC
[1/2] activemq-artemis git commit: This closes #500
Repository: activemq-artemis
Updated Branches:
refs/heads/master b863e69eb -> 7fb603f78
This closes #500
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7fb603f7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7fb603f7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7fb603f7
Branch: refs/heads/master
Commit: 7fb603f78fb484a8211cc942b35e867df34e4d10
Parents: b863e69 4bab1f0
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue May 3 14:22:32 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue May 3 14:22:32 2016 +0100
----------------------------------------------------------------------
.../activemq/artemis/core/config/impl/ConfigurationImpl.java | 5 ++++-
.../core/server/impl/LegacyLDAPSecuritySettingPlugin.java | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-512 NPEs in LDAP authz
Posted by ma...@apache.org.
ARTEMIS-512 NPEs in LDAP authz
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4bab1f06
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4bab1f06
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4bab1f06
Branch: refs/heads/master
Commit: 4bab1f06442fc27770d03b18af61c23168a30d52
Parents: b863e69
Author: jbertram <jb...@apache.org>
Authored: Mon May 2 08:40:02 2016 -0500
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue May 3 14:22:32 2016 +0100
----------------------------------------------------------------------
.../activemq/artemis/core/config/impl/ConfigurationImpl.java | 5 ++++-
.../core/server/impl/LegacyLDAPSecuritySettingPlugin.java | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4bab1f06/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
index 8b898b0..bedfa56 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
@@ -1151,7 +1151,10 @@ public class ConfigurationImpl implements Configuration, Serializable {
@Override
public Map<String, Set<Role>> getSecurityRoles() {
for (SecuritySettingPlugin securitySettingPlugin : securitySettingPlugins) {
- securitySettings.putAll(securitySettingPlugin.getSecurityRoles());
+ Map<String, Set<Role>> securitySettings = securitySettingPlugin.getSecurityRoles();
+ if (securitySettings != null) {
+ securitySettings.putAll(securitySettings);
+ }
}
return securitySettings;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4bab1f06/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
index 60fa632..6a0710a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
@@ -398,7 +398,9 @@ public class LegacyLDAPSecuritySettingPlugin implements SecuritySettingPlugin {
}
try {
- context.close();
+ if (context != null) {
+ context.close();
+ }
}
catch (NamingException e) {
// ignore