ozeigermann 2004/12/10 04:55:57
Modified: src/stores/org/apache/slide/store/mem
AbstractTransientStore.java
src/share/org/apache/slide/store
ConcurrencyConflictException.java
Log:
Added support repeat of conflicting transactions to
memory stores.
Revision Changes Path
1.6 +7 -3
jakarta-slide/src/stores/org/apache/slide/store/mem/AbstractTransientStore.java
Index: AbstractTransientStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/mem/AbstractTransientStore.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractTransientStore.java 24 Nov 2004 15:25:52 -0000 1.5
+++ AbstractTransientStore.java 10 Dec 2004 12:55:56 -0000 1.6
@@ -50,6 +50,7 @@
import org.apache.slide.common.ServiceParameterErrorException;
import org.apache.slide.common.ServiceParameterMissingException;
import org.apache.slide.common.ServiceResetFailedException;
+import org.apache.slide.store.ConcurrencyConflictException;
import org.apache.slide.util.logger.Logger;
import org.apache.slide.util.logger.TxLogger;
@@ -105,11 +106,14 @@
this.xaResource.commit(xid, onePhase);
}
catch (ConflictException e) {
+ throw new ConcurrencyConflictException();
+/*
this.xaResource.rollback(xid);
// TODO it would be great if we could throw something
// that would (on the webdav layer) leads to a 409 Conflict
// instead of 500 Internal Server Error
throw new XAException(XAException.XA_RBOTHER); // ??
+ */
}
}
1.2 +8 -4
jakarta-slide/src/share/org/apache/slide/store/ConcurrencyConflictException.java
Index: ConcurrencyConflictException.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/store/ConcurrencyConflictException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConcurrencyConflictException.java 7 Dec 2004 17:03:03 -0000 1.1
+++ ConcurrencyConflictException.java 10 Dec 2004 12:55:57 -0000 1.2
@@ -47,6 +47,10 @@
this(e.getErrorCode(), e.getMessage(), uri);
}
+ public ConcurrencyConflictException() {
+ this(-1, "Conflict Exception", null);
+ }
+
public String toString() {
StringBuffer buf = new StringBuffer();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
