svn commit: r155312 - in geronimo/trunk/modules/security/src/java/org/apache/geronimo/security: ContextManager.java jacc/GeronimoPolicy.java

[jgenender]

Author: jgenender
Date: Fri Feb 25 00:32:12 2005
New Revision: 155312

URL: http://svn.apache.org/viewcvs?view=rev&rev=155312
Log:
Fixed per GERONIMO-586

Modified:
    
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/ContextManager.java
    
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicy.java

Modified: 
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/ContextManager.java
URL: 
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/ContextManager.java?view=diff&r1=155311&r2=155312
==============================================================================
--- 
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/ContextManager.java
 (original)
+++ 
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/ContextManager.java
 Fri Feb 25 00:32:12 2005
@@ -54,14 +54,13 @@
     private static String algorithm;
     private static String password;
 
+    public static final GeronimoSecurityPermission GET_CONTEXT = new 
GeronimoSecurityPermission("getContext");
+    public static final GeronimoSecurityPermission SET_CONTEXT = new 
GeronimoSecurityPermission("setContext");
+
     static {
         password = "secret";
         ContextManager.setAlgorithm("HmacSHA1");
     }
-
-
-    public static final GeronimoSecurityPermission GET_CONTEXT = new 
GeronimoSecurityPermission("getContext");
-    public static final GeronimoSecurityPermission SET_CONTEXT = new 
GeronimoSecurityPermission("setContext");
 
     /**
      * After a login, the client is left with a relatively empty Subject, while

Modified: 
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicy.java
URL: 
http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicy.java?view=diff&r1=155311&r2=155312
==============================================================================
--- 
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicy.java
 (original)
+++ 
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/GeronimoPolicy.java
 Fri Feb 25 00:32:12 2005
@@ -59,6 +59,9 @@
     }
 
     public PermissionCollection getPermissions(CodeSource codesource) {
+
+        if (root != null) return root.getPermissions(codesource);
+
         return null;
     }