From portal-commits at lists.jboss.org Tue Apr  7 15:55:44 2009
Content-Type: multipart/mixed; boundary="===============1158153011672464195=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r13176 -
 modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap.
Date: Tue, 07 Apr 2009 15:55:44 -0400
Message-ID: <E1LrHOa-0003S3-1S@committer01.frg.pub.inap.atl.jboss.com>

--===============1158153011672464195==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: sviluppatorefico
Date: 2009-04-07 15:55:43 -0400 (Tue, 07 Apr 2009)
New Revision: 13176

Modified:
   modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/=
jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java
   modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/=
jboss/portal/identity/ldap/LDAPRoleModuleImpl.java
Log:
see https://jira.jboss.org/jira/browse/JBPORTAL-2352

Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/ma=
in/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org=
/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java	2009-04-07 19:55:11 =
UTC (rev 13175)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org=
/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java	2009-04-07 19:55:43 =
UTC (rev 13176)
@@ -22,18 +22,6 @@
  *************************************************************************=
*****/
 package org.jboss.portal.identity.ldap;
 =

-import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.identity.IdentityConfiguration;
-import org.jboss.portal.identity.IdentityException;
-import org.jboss.portal.identity.Role;
-
-import javax.naming.NamingException;
-import javax.naming.NamingEnumeration;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-import javax.naming.ldap.LdapContext;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -41,6 +29,18 @@
 import java.util.NoSuchElementException;
 import java.util.Set;
 =

+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import javax.naming.ldap.LdapContext;
+
+import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.identity.IdentityConfiguration;
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.Role;
+
 /**
  * @author <a href=3D"mailto:boleslaw.dawidowicz(a)jboss.org">Boleslaw Daw=
idowicz</a>
  * @version $Revision: 1.1 $
@@ -73,6 +73,10 @@
             throw new IdentityException("Found more than one role with id:=
 " + name + "" +
                "Posible data inconsistency");
          }
+         if (sr.size() =3D=3D 0)
+         {
+            throw new IdentityException("No such role " + name);
+         }
          SearchResult res =3D (SearchResult)sr.iterator().next();
          DirContext ctx  =3D (DirContext)res.getObject();
          return createRoleInstance(res.getAttributes(),ctx.getNameInNamesp=
ace());

Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/ma=
in/org/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org=
/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java	2009-04-07 19:55:11 UTC=
 (rev 13175)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org=
/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java	2009-04-07 19:55:43 UTC=
 (rev 13176)
@@ -22,13 +22,12 @@
  *************************************************************************=
*****/
 package org.jboss.portal.identity.ldap;
 =

-import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.identity.IdentityException;
-import org.jboss.portal.identity.Role;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.IdentityContext;
-import org.jboss.portal.identity.MembershipModule;
-import org.jboss.portal.identity.IdentityConfiguration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
 =

 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
@@ -36,19 +35,16 @@
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttribute;
 import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
-import javax.naming.directory.DirContext;
 import javax.naming.ldap.LdapContext;
-import javax.naming.ldap.InitialLdapContext;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Enumeration;
 =

+import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.identity.IdentityConfiguration;
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.Role;
+
 /**
  * @author <a href=3D"mailto:boleslaw.dawidowicz(a)jboss.org">Boleslaw Daw=
idowicz</a>
  * @version $Revision: 1.1 $
@@ -78,6 +74,10 @@
             throw new IdentityException("Found more than one role with id:=
 " + name + "" +
                "Posible data inconsistency");
          }
+         if (sr.size() =3D=3D 0)
+         {
+            throw new IdentityException("No such role " + name);
+         }
          SearchResult res =3D (SearchResult)sr.iterator().next();
          DirContext ctx  =3D (DirContext)res.getObject();
          return createRoleInstance(res.getAttributes(),ctx.getNameInNamesp=
ace());


--===============1158153011672464195==--