[jboss-cvs] JBossAS SVN: r71566 - projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core.

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

Author: anil.saldhana at jboss.com
Date: 2008-04-01 15:12:21 -0400 (Tue, 01 Apr 2008)
New Revision: 71566

Modified:
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossRequestContext.java
Log:
make additional checks for null

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java	2008-04-01 18:16:06 UTC (rev 71565)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java	2008-04-01 19:12:21 UTC (rev 71566)
@@ -313,13 +313,15 @@
          is = url.openStream();
       }
       catch (Exception e)
-      {
+      { 
       }
       if (is == null)
       {
          ClassLoader tcl = SecurityActions.getContextClassLoader();
          is = tcl.getResourceAsStream(loc);
       }
+      if(is == null)
+         throw new RuntimeException("Null Inputstream for "+ loc);
       return is;
    }
 

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossRequestContext.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossRequestContext.java	2008-04-01 18:16:06 UTC (rev 71565)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossRequestContext.java	2008-04-01 19:12:21 UTC (rev 71566)
@@ -89,7 +89,10 @@
    { 
       try
       {
-         RequestCtx request = RequestCtx.getInstance(getRequest(is));
+         Node root = getRequest(is);
+         if(root == null)
+            throw new IllegalStateException("Root node read from the input stream is null");
+         RequestCtx request = RequestCtx.getInstance(root);
          set(XACMLConstants.REQUEST_CTX, request);
       }
       catch (Exception e)