Author: orudyy
Date: Fri Jun 19 09:18:18 2015
New Revision: 1686377
URL: http://svn.apache.org/r1686377
Log:
QPID-6591: Fix NPE which might occur in VHN configuration thread when VH is get
closed from other thread and VH Principal become null
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java?rev=1686377&r1=1686376&r2=1686377&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java
Fri Jun 19 09:18:18 2015
@@ -338,7 +338,7 @@ public class TaskExecutorImpl implements
if (additionalPrincipal != null &&
!principals.contains(additionalPrincipal))
{
Set<Principal> extendedPrincipals = new HashSet<>(principals);
- extendedPrincipals.add(_principalAccessor.getPrincipal());
+ extendedPrincipals.add(additionalPrincipal);
contextSubject = new Subject(contextSubject.isReadOnly(),
extendedPrincipals,
contextSubject.getPublicCredentials(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
