X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.enterprise%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FWcXaResource.java;h=1630b6bd36befa841d3968b84d260750dda8e017;hb=f9efbe5228615951dd8482a4582aa24e00c10ce5;hp=a6048fdcaf57e12c24d7bd96e48e51e4c74246f2;hpb=e66b9893b0e511f8ab295e3cee42b7dc966f1597;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/WcXaResource.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/WcXaResource.java index a6048fdca..1630b6bd3 100644 --- a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/WcXaResource.java +++ b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/WcXaResource.java @@ -7,13 +7,8 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** {@link XAResource} for a user directory being edited. */ class WcXaResource implements XAResource { - private final static Log log = LogFactory.getLog(WcXaResource.class); - private final AbstractUserDirectory userDirectory; private Map workingCopies = new HashMap(); @@ -28,11 +23,9 @@ class WcXaResource implements XAResource { public synchronized void start(Xid xid, int flags) throws XAException { if (editingXid != null) throw new UserDirectoryException("Already editing " + editingXid); - UserDirectoryWorkingCopy wc = workingCopies.put(xid, - new UserDirectoryWorkingCopy()); + UserDirectoryWorkingCopy wc = workingCopies.put(xid, new UserDirectoryWorkingCopy()); if (wc != null) - throw new UserDirectoryException( - "There is already a working copy for " + xid); + throw new UserDirectoryException("There is already a working copy for " + xid); this.editingXid = xid; } @@ -50,8 +43,7 @@ class WcXaResource implements XAResource { return null; UserDirectoryWorkingCopy wc = workingCopies.get(editingXid); if (wc == null) - throw new UserDirectoryException("No working copy found for " - + editingXid); + throw new UserDirectoryException("No working copy found for " + editingXid); return wc; } @@ -70,7 +62,7 @@ class WcXaResource implements XAResource { try { userDirectory.prepare(wc); } catch (Exception e) { - log.error("Cannot prepare " + xid, e); + e.printStackTrace(); throw new XAException(XAException.XAER_RMERR); } return XA_OK; @@ -87,7 +79,7 @@ class WcXaResource implements XAResource { userDirectory.prepare(wc); userDirectory.commit(wc); } catch (Exception e) { - log.error("Cannot commit " + xid, e); + e.printStackTrace(); throw new XAException(XAException.XAER_RMERR); } finally { cleanUp(xid); @@ -100,7 +92,7 @@ class WcXaResource implements XAResource { checkXid(xid); userDirectory.rollback(wc(xid)); } catch (Exception e) { - log.error("Cannot rollback " + xid, e); + e.printStackTrace(); throw new XAException(XAException.XAER_RMERR); } finally { cleanUp(xid);