Improve user management

[lgpl/argeo-commons.git] / org.argeo.util / src / org / argeo / util / transaction / WorkingCopyXaResource.java

diff --git a/org.argeo.util/src/org/argeo/util/transaction/WorkingCopyXaResource.java b/org.argeo.util/src/org/argeo/util/transaction/WorkingCopyXaResource.java
index ebafd267fb04cca13ab5ba0ecbcfeda336d8a0b7..ddb605a19fd49e06db3e43ec7b043af8d3afab1d 100644 (file)
--- a/org.argeo.util/src/org/argeo/util/transaction/WorkingCopyXaResource.java
+++ b/org.argeo.util/src/org/argeo/util/transaction/WorkingCopyXaResource.java
@@ -48,8 +48,11 @@ public class WorkingCopyXaResource<WC extends WorkingCopy<?, ?, ?>> implements X
        }
 
        private synchronized void cleanUp(Xid xid) {
-               wc(xid).cleanUp();
-               workingCopies.remove(xid);
+               WC wc = workingCopies.get(xid);
+               if (wc != null) {
+                       wc.cleanUp();
+                       workingCopies.remove(xid);
+               }
                editingXid = null;
        }