Author: lquack
Date: Thu Oct 6 14:22:09 2016
New Revision: 1763593
URL: http://svn.apache.org/viewvc?rev=1763593&view=rev
Log:
QPID-7352: [Java Broker] Avoid NPE in GenericPrincipal
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/preferences/GenericPrincipal.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/preferences/GenericPrincipal.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/preferences/GenericPrincipal.java?rev=1763593&r1=1763592&r2=1763593&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/preferences/GenericPrincipal.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/preferences/GenericPrincipal.java
Thu Oct 6 14:22:09 2016
@@ -28,6 +28,7 @@ import java.util.Collection;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.security.QpidPrincipal;
public class GenericPrincipal implements Principal
@@ -42,8 +43,17 @@ public class GenericPrincipal implements
public GenericPrincipal(final QpidPrincipal principal)
{
_name = principal.getName();
- _originType = principal.getOrigin().getType();
- _originName = principal.getOrigin().getName();
+ ConfiguredObject<?> origin = principal.getOrigin();
+ if (origin != null)
+ {
+ _originType = origin.getType();
+ _originName = origin.getName();
+ }
+ else
+ {
+ _originType = "UNKNOWN";
+ _originName = "";
+ }
}
public GenericPrincipal(final String name)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
