svn commit: [jahia] r17434 - /branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexport/UsersImportHandler.java

[tdraier]

Author: tdraier
Date: Fri Jun  1 11:52:44 2007
New Revision: 17434

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17434&repname=
=3Djahia
Log:
changed user check (JAHIA-1957)

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/UsersImportHandler.java

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/imp=
ortexport/UsersImportHandler.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/importexport/UsersImportHandler.ja=
va&rev=3D17434&repname=3Djahia
=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=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/UsersImportHandler.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/UsersImportHandler.java Fri Jun  1 11:52:44 2007
@@ -87,9 +87,8 @@
                         }
                     }
                     if (name !=3D null && pass !=3D null) {
-                        JahiaUser user;
-                        if ((user =3D u.lookupUser(site.getID(), name)) =
=3D=3D null) {
-                            user =3D u.createUser(name, pass, name+":"+sit=
e.getID(), site.getID(), p);
+                       if (su.getMember(site.getID(), name) =3D=3D null) {
+                            JahiaUser user =3D u.createUser(name, pass, na=
me+":"+site.getID(), site.getID(), p);
                             su.addMember(site.getID(), user);
                         }
                     }

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list