From commits-return-12316-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Sun Feb 04 11:25:39 2007 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 77568 invoked from network); 4 Feb 2007 11:25:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Feb 2007 11:25:38 -0000 Received: (qmail 58559 invoked by uid 500); 4 Feb 2007 11:25:44 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 58506 invoked by uid 500); 4 Feb 2007 11:25:44 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 58495 invoked by uid 99); 4 Feb 2007 11:25:44 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Feb 2007 03:25:44 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Feb 2007 03:25:37 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 82F1B1A981A; Sun, 4 Feb 2007 03:25:16 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r503388 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Date: Sun, 04 Feb 2007 11:25:15 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070204112516.82F1B1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sun Feb 4 03:25:13 2007 New Revision: 503388 URL: http://svn.apache.org/viewvc?view=rev&rev=503388 Log: Used generic to remove warnings Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?view=diff&rev=503388&r1=503387&r2=503388 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Sun Feb 4 03:25:13 2007 @@ -35,6 +35,7 @@ import org.apache.directory.shared.ldap.filter.SimpleNode; import org.apache.directory.shared.ldap.message.ModificationItemImpl; import org.apache.directory.shared.ldap.name.LdapDN; +import org.apache.directory.shared.ldap.schema.OidNormalizer; import org.apache.directory.shared.ldap.util.AttributeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,7 +75,7 @@ private static final boolean IS_DEBUG = log.isDebugEnabled(); /** String key for the DN of a group to a Set (HashSet) for the Strings of member DNs */ - private final Map groups = new HashMap(); + private final Map> groups = new HashMap>(); /** a handle on the partition nexus */ private final PartitionNexus nexus; /** the env to use for searching */ @@ -83,7 +84,7 @@ /** * The OIDs normalizer map */ - private Map normalizerMap; + private Map normalizerMap; /** the normalized dn of the administrators group */ LdapDN administratorsGroupDn; @@ -142,7 +143,7 @@ if ( members != null ) { - Set memberSet = new HashSet( members.size() ); + Set memberSet = new HashSet( members.size() ); addMembers( memberSet, members ); groups.put( groupDn, memberSet ); } @@ -208,7 +209,7 @@ * @param members the member attribute values being added * @throws NamingException if there are problems accessing the attr values */ - private void addMembers( Set memberSet, Attribute members ) throws NamingException + private void addMembers( Set memberSet, Attribute members ) throws NamingException { for ( int ii = 0; ii < members.size(); ii++ ) { @@ -275,7 +276,7 @@ return; } - Set memberSet = new HashSet( members.size() ); + Set memberSet = new HashSet( members.size() ); addMembers( memberSet, members ); groups.put( normName.toString(), memberSet ); @@ -320,7 +321,7 @@ * @param members the members being added, removed or replaced * @throws NamingException if there are problems accessing attribute values */ - private void modify( Set memberSet, int modOp, Attribute members ) throws NamingException + private void modify( Set memberSet, int modOp, Attribute members ) throws NamingException { switch ( modOp ) @@ -380,11 +381,13 @@ { if ( memberAttrId.equalsIgnoreCase( mods[ii].getAttribute().getID() ) ) { - Set memberSet = ( Set ) groups.get( name.toString() ); + Set memberSet = groups.get( name.toString() ); + if ( memberSet != null ) { modify( memberSet, mods[ii].getModificationOp(), mods[ii].getAttribute() ); } + break; } } @@ -415,7 +418,8 @@ return; } - Set memberSet = ( Set ) groups.get( name.toString() ); + Set memberSet = groups.get( name.toString() ); + if ( memberSet != null ) { modify( memberSet, modOp, members ); @@ -476,7 +480,7 @@ return Collections.EMPTY_SET; } - Set memberGroups = null; + Set memberGroups = null; Iterator list = groups.keySet().iterator(); while ( list.hasNext() ) @@ -493,7 +497,7 @@ { if ( memberGroups == null ) { - memberGroups = new HashSet(); + memberGroups = new HashSet(); } memberGroups.add( new LdapDN( group ) ); @@ -511,7 +515,7 @@ public boolean groupRenamed( Name oldName, Name newName ) { - Object members = groups.remove( oldName.toString() ); + Set members = groups.remove( oldName.toString() ); if ( members != null ) {