ozeigermann 2003/11/21 03:50:13
Modified: src/stores/org/apache/slide/store/txfile
AbstractTxFileStoreService.java
src/share/org/apache/slide/util XidWrapper.java
Log:
Dismantled quick hack I had once introduced to make my store work with Slide.
Must not check for branch Id in one phase commit to identify xid
Revision Changes Path
1.5 +3 -4
jakarta-slide/src/stores/org/apache/slide/store/txfile/AbstractTxFileStoreService.java
Index: AbstractTxFileStoreService.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/txfile/AbstractTxFileStoreService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractTxFileStoreService.java 14 Nov 2003 16:25:06 -0000 1.4
+++ AbstractTxFileStoreService.java 21 Nov 2003 11:50:13 -0000 1.5
@@ -141,7 +141,6 @@
public void connect() throws ServiceConnectionFailedException {
try {
- XidWrapper.setIncludeBranch(false);
rm.start();
started = true;
} catch (ResourceManagerException e) {
1.2 +5 -8 jakarta-slide/src/share/org/apache/slide/util/XidWrapper.java
Index: XidWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/util/XidWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XidWrapper.java 14 Nov 2003 12:52:51 -0000 1.1
+++ XidWrapper.java 21 Nov 2003 11:50:13 -0000 1.2
@@ -14,22 +14,19 @@
*/
public class XidWrapper implements Xid {
- private static boolean includeBranch = true;
-
- // for slide branch qualifier must not be included
- public static final void setIncludeBranch(boolean includeBranch) {
- XidWrapper.includeBranch = includeBranch;
+ public static final Xid wrap(Xid xid) {
+ return wrap(xid, false); // for Slide branch qualifier must not be included
in onePhase commit
}
- public static final Xid wrap(Xid xid) {
- return (xid instanceof XidWrapper ? xid : new XidWrapper(xid));
+ public static final Xid wrap(Xid xid, boolean includeBranch) {
+ return (xid instanceof XidWrapper ? xid : new XidWrapper(xid,
includeBranch));
}
private final Xid xid;
private final String asString;
private final int hashCode;
- public XidWrapper(Xid xid) {
+ private XidWrapper(Xid xid, boolean includeBranch) {
this.xid = xid;
// do calculations once for performance
asString =
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
