Changeset 795:115d093b990d

Timestamp:

01/20/12 09:05:29 (4 months ago)

Author:

delmitz@delmitz-PC.office.nchovy.net

Branch:

default

Children:

797:1cd75f3ad1a9, 798:18dc986d4e82

Parents:

794:ff94810e0e84 (diff), 793:e9056273c248 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge

Files:

• kraken-dom/src/main/java/org/krakenapps/dom/api/impl/UserApiImpl.java (modified) (2 diffs)
• kraken-dom/src/main/java/org/krakenapps/dom/api/impl/UserApiImpl.java (modified) (2 diffs)

kraken-dom/src/main/java/org/krakenapps/dom/api/impl/UserApiImpl.java

@@ -30 +30 @@
 import org.apache.felix.ipojo.annotations.Validate;
 import org.krakenapps.confdb.Config;
+import org.krakenapps.confdb.ConfigIterator;
 import org.krakenapps.confdb.ConfigTransaction;
 import org.krakenapps.confdb.Predicate;
@@ -271 +272 @@
         @Override
         public void entityRemoving(String domain, OrganizationUnit orgUnit, ConfigTransaction xact, Object state) {
-                boolean remove = (state != null) && (state instanceof Boolean) && ((Boolean) state);
-
-                for (User user : getUsers(domain, orgUnit.getGuid(), false)) {
-                        Config c = xact.getDatabase().findOne(cls, getPred(user.getLoginName()));
-
-                        if (remove) {
-                                xact.getDatabase().remove(xact, c, true);
-                        } else {
+                boolean move = (state != null) && (state instanceof Boolean) && ((Boolean) state);
+
+                List<Predicate> preds = new ArrayList<Predicate>();
+                for (User user : getUsers(domain, orgUnit.getGuid(), false))
+                        preds.add(getPred(user.getLoginName()));
+
+                ConfigIterator it = xact.getDatabase().find(cls, Predicates.or(preds.toArray(new Predicate[0])));
+                while (it.hasNext()) {
+                        Config c = it.next();
+                        User user = c.getDocument(User.class);
+
+                        if (move) {
                                 user.setOrgUnit(null);
                                 xact.getDatabase().update(xact, c, user, true);
+                        } else {
+                                xact.getDatabase().remove(xact, c, true);
                         }
                 }

kraken-dom/src/main/java/org/krakenapps/dom/api/impl/UserApiImpl.java

@@ -46 +46 @@
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Component(name = "dom-user-api")
 @Provides
 public class UserApiImpl extends DefaultEntityEventProvider<User> implements UserApi, EntityEventListener<OrganizationUnit> {
+        private final Logger logger = LoggerFactory.getLogger(UserApiImpl.class.getName());
         private static final Class<User> cls = User.class;
         private static final String NOT_FOUND = "user-not-found";
@@ -213 +216 @@
                 Random rand = new Random();
                 char[] c = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789".toCharArray();
-                for (int i = 0; i < getSaltLength(domain); i++)
+                
+                int saltLength = getSaltLength(domain);
+                logger.trace("kraken dom: salt length [{}]", saltLength);
+
+                for (int i = 0; i < saltLength; i++)
                         salt.append(c[rand.nextInt(c.length)]);
                 return salt.toString();