Author: anil.saldhana(a)jboss.com
Date: 2011-10-07 17:18:40 -0400 (Fri, 07 Oct 2011)
New Revision: 1296
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/factories/SecurityActions.java
Log:
PLFED-238: avoid NPE in SecurityActions
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/factories/SecurityActions.java
===================================================================
---
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/factories/SecurityActions.java 2011-10-07
14:48:15 UTC (rev 1295)
+++
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/factories/SecurityActions.java 2011-10-07
21:18:40 UTC (rev 1296)
@@ -66,12 +66,17 @@
{
MBeanServer server = i.next();
- if (server.getDefaultDomain().contains("Default"))
- cached = server;
+ String defaultDomain = server.getDefaultDomain();
- if (server.getDefaultDomain().equals("jboss"))
+ if (defaultDomain != null)
{
- return server;
+ if (defaultDomain.contains("Default"))
+ cached = server;
+
+ if (defaultDomain.equals("jboss"))
+ {
+ return server;
+ }
}
}
if (cached != null)