User: stark
Date: 01/02/14 13:20:12
Modified: security/src/main/org/jboss/test/security/test/ejbs/project/support
HeirMemoryMap.java
Log:
Updated SecurityInterceptor to be independent of any JAAS classes
and refactored security proxy layer to simplify the model.
Revision Changes Path
1.2 +10 -5
contrib/security/src/main/org/jboss/test/security/test/ejbs/project/support/HeirMemoryMap.java
Index: HeirMemoryMap.java
===================================================================
RCS file:
/products/cvs/ejboss/contrib/security/src/main/org/jboss/test/security/test/ejbs/project/support/HeirMemoryMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HeirMemoryMap.java 2001/02/12 09:29:47 1.1
+++ HeirMemoryMap.java 2001/02/14 21:20:12 1.2
@@ -28,7 +28,7 @@
store and unix style path names.
@author [EMAIL PROTECTED]
-@version $Id: HeirMemoryMap.java,v 1.1 2001/02/12 09:29:47 stark Exp $
+@version $Id: HeirMemoryMap.java,v 1.2 2001/02/14 21:20:12 stark Exp $
*/
public class HeirMemoryMap extends DirContextStringImpl implements DirContext,
Serializable
{
@@ -277,8 +277,10 @@
String atom = name.get(0);
Object binding = bindings.get(atom);
if( name.size() == 1 )
- {
- if( binding == null )
+ { /* Need to check that binding is null and atom is not a key
+ since a null value could have been bound.
+ */
+ if( binding == null && bindings.containsKey(atom) == false )
{
NameNotFoundException e = new
NameNotFoundException("Failed to find: "+atom);
e.setRemainingName(name);
@@ -366,8 +368,10 @@
String atom = name.get(0);
Object binding = bindings.get(atom);
if( name.size() == 1 )
- {
- if( binding == null )
+ { /* Need to check that binding is null and atom is not a key
+ since a null value could have been bound.
+ */
+ if( binding == null && bindings.containsKey(atom) == false )
{
NameNotFoundException e = new
NameNotFoundException("Failed to find: "+atom);
e.setRemainingName(name);
@@ -375,6 +379,7 @@
throw e;
}
bindings.remove(atom);
+ bindingAttrs.remove(atom);
}
else if( (binding instanceof Context) )
{