Author: rgodfrey
Date: Fri Jul 15 12:46:20 2016
New Revision: 1752834
URL: http://svn.apache.org/viewvc?rev=1752834&view=rev
Log:
QPID-7318 : Fix NPEs on shutdown
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1752834&r1=1752833&r2=1752834&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
Fri Jul 15 12:46:20 2016
@@ -2955,7 +2955,7 @@ public abstract class AbstractConfigured
private Subject getSystemSubject(Principal... principals)
{
Set<Principal> principalSet = new HashSet<>(Arrays.asList(principals));
- principalSet.add(_systemPrincipal);
+ principalSet.add(getSystemPrincipal());
return new Subject(true,
principalSet,
Collections.emptySet(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
