[jboss-cvs] JBossAS SVN: r76985 - projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/helpers.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2008-08-12 08:34:40 -0400 (Tue, 12 Aug 2008)
New Revision: 76985

Modified:
   projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/helpers/EJBContextHelper.java
Log:
EJBTHREE-1460: fixed NPE

Modified: projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/helpers/EJBContextHelper.java
===================================================================
--- projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/helpers/EJBContextHelper.java	2008-08-12 11:31:23 UTC (rev 76984)
+++ projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/helpers/EJBContextHelper.java	2008-08-12 12:34:40 UTC (rev 76985)
@@ -174,13 +174,9 @@
    
    private String getContextID()
    {
-      try
-      {
-         return PolicyContext.getContextID();
-      }
-      catch(Exception e)
-      {
-         throw new RuntimeException(e);
-      }
+      String contextID = PolicyContext.getContextID();
+      if(contextID == null)
+         throw new IllegalStateException("No policy context id is set");
+      return contextID;
    }
 }
\ No newline at end of file