summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src/main
diff options
context:
space:
mode:
authorAidan Skinner <aidan@apache.org>2008-12-09 17:23:17 +0000
committerAidan Skinner <aidan@apache.org>2008-12-09 17:23:17 +0000
commit51166ac18a7f450828b0467e72406e575c98c439 (patch)
treee44da95dc140c202472a756b48672cc62adb3e08 /qpid/java/broker/src/main
parent5b0299abeef865d74ebf827bedd0a26f4d6d8ab1 (diff)
downloadqpid-python-51166ac18a7f450828b0467e72406e575c98c439.tar.gz
QPID-1469: Fix NullPointerException, add test for deleteUser which would expose this.
Patch from gemmellr@dcs.gla.ac.uk git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@724787 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/main')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
index a8ae03cc5d..32ec3a3bbc 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
@@ -441,7 +441,12 @@ public class AMQUserManagementMBean extends AMQManagedObject implements UserMana
private String getCurrentJMXUser()
{
AccessControlContext acc = AccessController.getContext();
+
Subject subject = Subject.getSubject(acc);
+ if (subject == null)
+ {
+ return "Unknown user, authentication Subject was null";
+ }
// Retrieve JMXPrincipal from Subject
Set<JMXPrincipal> principals = subject.getPrincipals(JMXPrincipal.class);