Fix URI when using default LDIF

[lgpl/argeo-commons.git] / org.argeo.security.core / src / org / argeo / osgi / useradmin / AbstractUserDirectory.java

diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java b/org.argeo.security.core/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
index e79800f102e1efb46822526a3c098afd0136f3a7..671f634969bd8f49db28a20eabace94a02df6c17 100644 (file)
--- a/org.argeo.security.core/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
+++ b/org.argeo.security.core/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
@@ -26,8 +26,9 @@ import javax.naming.ldap.Rdn;
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
-import javax.transaction.xa.Xid;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.Filter;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
@@ -38,6 +39,9 @@ import org.osgi.service.useradmin.UserAdmin;
 
 /** Base class for a {@link UserDirectory}. */
 abstract class AbstractUserDirectory implements UserAdmin, UserDirectory {
+       private final static Log log = LogFactory
+                       .getLog(AbstractUserDirectory.class);
+
        private final Hashtable<String, Object> properties;
        private final String baseDn;
        private final String userObjectClass;
@@ -55,8 +59,9 @@ abstract class AbstractUserDirectory implements UserAdmin, UserDirectory {
                        .asList(new String[] { LdifName.userpassword.name() });
 
        private TransactionManager transactionManager;
-       private ThreadLocal<UserDirectoryWorkingCopy> workingCopy = new ThreadLocal<UserDirectoryWorkingCopy>();
-       private Xid editingTransactionXid = null;
+       // private TransactionSynchronizationRegistry transactionRegistry;
+       // private Xid editingTransactionXid = null;
+       private WcXaResource xaResource = new WcXaResource(this);
 
        AbstractUserDirectory(Dictionary<String, ?> props) {
                properties = new Hashtable<String, Object>();
@@ -107,19 +112,21 @@ abstract class AbstractUserDirectory implements UserAdmin, UserDirectory {
        }
 
        boolean isEditing() {
-               if (editingTransactionXid == null)
-                       return false;
-               return workingCopy.get() != null;
+               // if (editingTransactionXid == null)
+               // return false;
+               // return workingCopy.get() != null;
+               return xaResource.wc() != null;
        }
 
        protected UserDirectoryWorkingCopy getWorkingCopy() {
-               UserDirectoryWorkingCopy wc = workingCopy.get();
+               // UserDirectoryWorkingCopy wc = workingCopy.get();
+               UserDirectoryWorkingCopy wc = xaResource.wc();
                if (wc == null)
                        return null;
-               if (wc.getXid() == null) {
-                       workingCopy.set(null);
-                       return null;
-               }
+               // if (wc.getXid() == null) {
+               // workingCopy.set(null);
+               // return null;
+               // }
                return wc;
        }
 
@@ -133,23 +140,26 @@ abstract class AbstractUserDirectory implements UserAdmin, UserDirectory {
                if (transaction == null)
                        throw new UserDirectoryException(
                                        "A transaction needs to be active in order to edit");
-               if (editingTransactionXid == null) {
-                       UserDirectoryWorkingCopy wc = new UserDirectoryWorkingCopy(this);
+               if (xaResource.wc() == null) {
+                       // UserDirectoryWorkingCopy wc = new UserDirectoryWorkingCopy(this);
                        try {
-                               transaction.enlistResource(wc);
-                               editingTransactionXid = wc.getXid();
-                               workingCopy.set(wc);
+                               transaction.enlistResource(xaResource);
+                               // editingTransactionXid = wc.getXid();
+                               // workingCopy.set(wc);
                        } catch (Exception e) {
-                               throw new UserDirectoryException("Cannot enlist " + wc, e);
+                               throw new UserDirectoryException("Cannot enlist " + xaResource,
+                                               e);
                        }
                } else {
-                       if (workingCopy.get() == null)
-                               throw new UserDirectoryException("Transaction "
-                                               + editingTransactionXid + " already editing");
-                       else if (!editingTransactionXid.equals(workingCopy.get().getXid()))
-                               throw new UserDirectoryException("Working copy Xid "
-                                               + workingCopy.get().getXid() + " inconsistent with"
-                                               + editingTransactionXid);
+                       // UserDirectoryWorkingCopy wc = xaResource.wc();
+                       // if (wc == null)
+                       // throw new UserDirectoryException("Transaction "
+                       // + editingTransactionXid + " already editing");
+                       // else if
+                       // (!editingTransactionXid.equals(workingCopy.get().getXid()))
+                       // throw new UserDirectoryException("Working copy Xid "
+                       // + workingCopy.get().getXid() + " inconsistent with"
+                       // + editingTransactionXid);
                }
        }
 
@@ -240,6 +250,9 @@ abstract class AbstractUserDirectory implements UserAdmin, UserDirectory {
                }
                if (collectedUsers.size() == 1)
                        return collectedUsers.get(0);
+               else if (collectedUsers.size() > 1)
+                       log.warn(collectedUsers.size() + " users for "
+                                       + (key != null ? key + "=" : "") + value);
                return null;
        }
 
@@ -345,9 +358,9 @@ abstract class AbstractUserDirectory implements UserAdmin, UserDirectory {
 
        }
 
-       void clearEditingTransactionXid() {
-               editingTransactionXid = null;
-       }
+       // void clearEditingTransactionXid() {
+       // editingTransactionXid = null;
+       // }
 
        // UTILITIES
        protected LdapName toDn(String name) {
@@ -425,4 +438,8 @@ abstract class AbstractUserDirectory implements UserAdmin, UserDirectory {
                this.transactionManager = transactionManager;
        }
 
+       public WcXaResource getXaResource() {
+               return xaResource;
+       }
+
 }