[jboss-svn-commits] JBL Code SVN: r6414 - in labs/jbosstm/trunk: ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 25 09:16:34 EDT 2006
Author: kevin.conner at jboss.com
Date: 2006-09-25 09:16:27 -0400 (Mon, 25 Sep 2006)
New Revision: 6414
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/LastResourceRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/LastResourceRecord.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java
Log:
Fixed incorrect Uid and standardised through Uid class - for JBTM-132
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/LastResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/LastResourceRecord.java 2006-09-25 12:03:55 UTC (rev 6413)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/LastResourceRecord.java 2006-09-25 13:16:27 UTC (rev 6414)
@@ -36,12 +36,9 @@
import com.arjuna.ats.arjuna.coordinator.*;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.ats.arjuna.state.*;
import com.arjuna.ats.arjuna.gandiva.ClassName;
import java.io.PrintWriter;
-import java.io.IOException;
-
import com.arjuna.common.util.logging.*;
/**
@@ -247,6 +244,6 @@
private OnePhaseResource _lro;
- private static final Uid ONE_PHASE_RESOURCE_UID = Uid.maxUid() ;
+ private static final Uid ONE_PHASE_RESOURCE_UID = Uid.lastResourceUid() ;
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java 2006-09-25 12:03:55 UTC (rev 6413)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Uid.java 2006-09-25 13:16:27 UTC (rev 6414)
@@ -84,6 +84,7 @@
public class Uid implements Cloneable, Serializable
{
+ private static final long serialVersionUID = 7808395904206530189L;
/**
* Create a new instance.
@@ -425,10 +426,10 @@
if (this.equals(u))
return false ;
- if (MAX_UID.equals(this))
+ if (LAST_RESOURCE_UID.equals(this))
return false ;
- if (MAX_UID.equals(u))
+ if (LAST_RESOURCE_UID.equals(u))
return true ;
if (hostAddr < u.hostAddr)
@@ -462,10 +463,10 @@
if (this.equals(u))
return false ;
- if (MAX_UID.equals(this))
+ if (LAST_RESOURCE_UID.equals(this))
return true ;
- if (MAX_UID.equals(u))
+ if (LAST_RESOURCE_UID.equals(u))
return false ;
if (hostAddr > u.hostAddr)
@@ -501,32 +502,34 @@
* Return a null Uid (0:0:0:0)
*/
- public static final synchronized Uid nullUid ()
+ public static final Uid nullUid ()
{
- /*
- * Only create a single instance of this.
- */
-
- if (NIL_UID == null)
- NIL_UID = new Uid("0:0:0:0");
-
return NIL_UID;
}
/**
- * Return a max Uid (0:0:0:1)
+ * Return a last resource Uid (0:0:0:1)
*/
- public static final synchronized Uid maxUid ()
+ public static final Uid lastResourceUid ()
{
- /*
- * Only create a single instance of this.
- */
+ return LAST_RESOURCE_UID;
+ }
- if (MAX_UID == null)
- MAX_UID = new Uid("0:0:0:1");
-
+ /**
+ * Return the maximum Uid (7fffffff:7fffffff:7fffffff:7fffffff)
+ */
+ public static final Uid maxUid ()
+ {
return MAX_UID;
}
+
+ /**
+ * Return the minimum Uid (-80000000:-80000000:-80000000:-80000000)
+ */
+ public static final Uid minUid ()
+ {
+ return MIN_UID;
+ }
/*
* Serialization methods. Similar to buffer packing. If the Uid is invalid
@@ -679,7 +682,11 @@
private static char fileBreakChar = '_';
- private static Uid NIL_UID ;
+ private static Uid NIL_UID = new Uid("0:0:0:0") ;
- private static Uid MAX_UID ;
+ private static Uid LAST_RESOURCE_UID = new Uid("0:0:0:1") ;
+
+ private static Uid MAX_UID = new Uid("7fffffff:7fffffff:7fffffff:7fffffff") ;
+
+ private static Uid MIN_UID = new Uid("-80000000:-80000000:-80000000:-80000000") ;
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java 2006-09-25 12:03:55 UTC (rev 6413)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java 2006-09-25 13:16:27 UTC (rev 6414)
@@ -81,10 +81,9 @@
public static final int XACONNECTION = 0;
- private static final Uid START_XARESOURCE = new Uid("0:0:0:1");
+ private static final Uid START_XARESOURCE = Uid.minUid() ;
- private static final Uid END_XARESOURCE = new Uid(
- "7fffffff:7fffffff:7fffffff:7fffffff");
+ private static final Uid END_XARESOURCE = Uid.maxUid() ;
/**
* The params represent specific parameters we need to recreate the
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/LastResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/LastResourceRecord.java 2006-09-25 12:03:55 UTC (rev 6413)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/LastResourceRecord.java 2006-09-25 13:16:27 UTC (rev 6414)
@@ -10,7 +10,6 @@
*/
package com.arjuna.ats.internal.jta.resources.jts.orbspecific;
-import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
@@ -38,7 +37,7 @@
/**
* The Uid for all last xa resource records.
*/
- private static final String UID = Uid.maxUid().stringForm() ;
+ private static final String UID = Uid.lastResourceUid().stringForm() ;
/**
* Construct the record for last resource commit optimisation.
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2006-09-25 12:03:55 UTC (rev 6413)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2006-09-25 13:16:27 UTC (rev 6414)
@@ -92,10 +92,9 @@
public static final int XACONNECTION = 0;
- private static final Uid START_XARESOURCE = new Uid("0:0:0:1");
+ private static final Uid START_XARESOURCE = Uid.minUid() ;
- private static final Uid END_XARESOURCE = new Uid(
- "7fffffff:7fffffff:7fffffff:7fffffff");
+ private static final Uid END_XARESOURCE = Uid.maxUid() ;
/**
* The params represent specific parameters we need to recreate the
More information about the jboss-svn-commits
mailing list