[jboss-cvs] JBossAS SVN: r58663 - trunk/server/src/main/org/jboss/metadata

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

Author: thomas.diesler at jboss.com
Date: 2006-11-23 04:49:43 -0500 (Thu, 23 Nov 2006)
New Revision: 58663

Modified:
   trunk/server/src/main/org/jboss/metadata/WebSecurityMetaData.java
Log:
Fix setWebResources(WebResourceCollection webrc)

Modified: trunk/server/src/main/org/jboss/metadata/WebSecurityMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/WebSecurityMetaData.java	2006-11-23 02:56:43 UTC (rev 58662)
+++ trunk/server/src/main/org/jboss/metadata/WebSecurityMetaData.java	2006-11-23 09:49:43 UTC (rev 58663)
@@ -21,12 +21,12 @@
 */
 package org.jboss.metadata;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.TreeSet;
 
 import org.jboss.metadata.web.AuthConstraint;
@@ -60,8 +60,7 @@
    /** The HashMap<String, WebResourceCollection> for the
     * security-constraint/web-resource-collection elements
     */ 
-   private HashMap<String, WebResourceCollection> webResources =
-      new HashMap<String, WebResourceCollection>();
+   private HashMap<String, WebResourceCollection> webResources = new HashMap<String, WebResourceCollection>();
    /** Set<String> of the allowed role names defined by the
     * security-constraint/auth-constraint elements
     */
@@ -95,27 +94,31 @@
    public WebResourceCollection addWebResource(String name)
    {
       WebResourceCollection webrc = new WebResourceCollection(name);
-      if( webResources.containsKey(name) == true )
-      {
-         // A non-unique name, unique it
-         name = name + '@' + System.identityHashCode(webrc);
-      }
-      webResources.put(name, webrc);
+      setWebResources(webrc);
       return webrc;
    }
+   
    public Map<String, WebResourceCollection> getWebResources()
    {
       return webResources;
    }
-   public void setWebResources(WebResourceCollection collection)
+   
+   public void setWebResources(WebResourceCollection webrc)
    {
-      
+      String name = webrc.getName();
+      if( webResources.containsKey(name) == true )
+      {
+         // A non-unique name, unique it
+         name = name + '@' + System.identityHashCode(webrc);
+      }
+      webResources.put(name, webrc);
    }
 
    public void addRole(String name)
    {
       roles.add(name);
    }
+   
    /** Get the security-constraint/auth-constraint values. An empty role
     * set must be qualified by the isUnchecked and isExcluded methods.
     *