svn commit: [jahia] r17749 - /trunk/core/src/java/org/jahia/services/importexport/UsersImportHandler.java

[tdraier]

Author: tdraier
Date: Mon Jun 25 15:06:52 2007
New Revision: 17749

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

Modified:
    trunk/core/src/java/org/jahia/services/importexport/UsersImportHandler.=
java

Modified: trunk/core/src/java/org/jahia/services/importexport/UsersImportHa=
ndler.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/UsersImportHandler.java&rev=3D17749&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
--- trunk/core/src/java/org/jahia/services/importexport/UsersImportHandler.=
java (original)
+++ trunk/core/src/java/org/jahia/services/importexport/UsersImportHandler.=
java Mon Jun 25 15:06:52 2007
@@ -87,11 +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) {
+                       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