Index: topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityUtil.java diff -u topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityUtil.java:1.8 topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityUtil.java:1.9 --- topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityUtil.java:1.8 Mon Oct 16 14:15:46 2006 +++ topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityUtil.java Tue Oct 17 13:50:40 2006 @@ -24,10 +24,10 @@ * Created: 15 févr. 2006 * * @author Arnaud Thimel -* @version $Revision: 1.8 $ +* @version $Revision: 1.9 $ * -* Mise a jour: $Date: 2006/10/16 14:15:46 $ -* par : $Author: ruchaud $ +* Mise a jour: $Date: 2006/10/17 13:50:40 $ +* par : $Author: bpoussin $ */ package org.codelutin.topia.security.util; @@ -82,7 +82,14 @@ public static final String TOPIA_LOGIN_MODULE = TopiaLoginModule.class.getName(); - public static final String TOPIA_SECURITY_PERSISTENCE_CLASSES = "org.codelutin.topia.security.entities.authorization.HistoryImpl,org.codelutin.topia.security.entities.user.TopiaUserImpl,org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationImpl,org.codelutin.topia.security.entities.user.TopiaGroupImpl,org.codelutin.topia.security.entities.authorization.TopiaIdLinkImpl,org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl,org.codelutin.topia.security.entities.authorization.TopiaAuthorizationImpl"; + public static final String TOPIA_SECURITY_PERSISTENCE_CLASSES = + "org.codelutin.topia.history.entities.HistoryImpl," + + "org.codelutin.topia.security.entities.user.TopiaUserImpl," + + "org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationImpl," + + "org.codelutin.topia.security.entities.user.TopiaGroupImpl," + + "org.codelutin.topia.security.entities.authorization.TopiaIdLinkImpl," + + "org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl," + + "org.codelutin.topia.security.entities.authorization.TopiaAuthorizationImpl"; /** * Applique un algorithme de hashage sur la chaine de caratère passée en @@ -214,15 +221,9 @@ Subject subject = Subject.getSubject(AccessController.getContext()); if (subject != null) { for (Principal principal : subject.getPrincipals()) { - try { - Class className = TopiaId.getClassName(principal.getName()); - if(className.equals(TopiaUser.class)) { - return principal.getName(); - } - } catch (TopiaNotFoundException e) { - if(log.isWarnEnabled()) { - log.warn("No Topia object"); - } + String className = TopiaId.getClassNameAsString(principal.getName()); + if(className.equals(TopiaUser.class.getName())) { + return principal.getName(); } } }