[jboss-svn-commits] JBL Code SVN: r30084 - in labs/jbosstm/trunk: ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 10 05:24:22 EST 2009
Author: mark.little at jboss.com
Date: 2009-11-10 05:24:21 -0500 (Tue, 10 Nov 2009)
New Revision: 30084
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreIterator.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/Implementationsx.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java
Log:
https://jira.jboss.org/jira/browse/JBTM-615
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreIterator.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreIterator.java 2009-11-10 10:15:17 UTC (rev 30083)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/objectstore/ObjectStoreIterator.java 2009-11-10 10:24:21 UTC (rev 30084)
@@ -40,46 +40,45 @@
import java.io.IOException;
/**
- * Class that allows us to iterate through instances of objects
- * that may be stored within a specific object store.
+ * Class that allows us to iterate through instances of objects that may be
+ * stored within a specific object store.
*/
public class ObjectStoreIterator
{
-public ObjectStoreIterator (ObjectStore store, String tName)
+ public ObjectStoreIterator(ObjectStore store, String tName)
{
- try
- {
- store.allObjUids(tName, uidList);
- }
- catch (ObjectStoreException e)
- {
- }
+ try
+ {
+ store.allObjUids(tName, uidList);
+ }
+ catch (ObjectStoreException e)
+ {
+ }
}
-
+
/**
- * return the Uids from the list one at a time. ObjStore returns either
- * null list or a list terminated by the NIL_UID. Use the latter to return
- * 0 (for end of list)
+ * return the Uids from the list one at a time. ObjStore returns either null
+ * list or a list terminated by the NIL_UID. Use the latter to return 0 (for
+ * end of list)
*/
-public final synchronized Uid iterate ()
+ public final synchronized Uid iterate ()
{
- Uid newUid = null;
-
- try
- {
- newUid = UidHelper.unpackFrom(uidList);
- }
- catch (IOException e)
- {
- }
+ Uid newUid = null;
- return newUid;
+ try
+ {
+ newUid = UidHelper.unpackFrom(uidList);
+ }
+ catch (IOException e)
+ {
+ }
+
+ return newUid;
}
-private InputObjectState uidList;
-
+ private InputObjectState uidList;
+
}
-
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/Implementationsx.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/Implementationsx.java 2009-11-10 10:15:17 UTC (rev 30083)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/Implementationsx.java 2009-11-10 10:24:21 UTC (rev 30084)
@@ -35,13 +35,14 @@
import com.arjuna.ats.arjuna.coordinator.abstractrecord.RecordTypeManager;
import com.arjuna.ats.arjuna.coordinator.abstractrecord.RecordTypeMap;
import com.arjuna.ats.internal.jta.resources.jts.orbspecific.XAResourceRecord;
+import com.arjuna.ats.internal.jts.resources.ExtendedResourceRecord;
class ExtendedXAResourceRecordMap implements RecordTypeMap
{
@SuppressWarnings("unchecked")
public Class getRecordClass ()
{
- return XAResourceRecord.class;
+ return ExtendedResourceRecord.class;//XAResourceRecord.class;
}
public int getType ()
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 2009-11-10 10:15:17 UTC (rev 30083)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2009-11-10 10:24:21 UTC (rev 30084)
@@ -157,6 +157,25 @@
}
}
+ // for recovery only!
+
+ public XAResourceRecord ()
+ {
+ _theXAResource = null;
+ _recoveryObject = null;
+ _tranID = null;
+
+ _valid = true;
+
+ _prepared = true;
+ _committed = false;
+ _heuristic = TwoPhaseOutcome.FINISH_OK;
+ _objStore = null;
+ _theUid = new Uid();
+ _theReference = null;
+ _recoveryCoordinator = null;
+ }
+
public final Uid get_uid()
{
return _theUid;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java 2009-11-10 10:15:17 UTC (rev 30083)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java 2009-11-10 10:24:21 UTC (rev 30084)
@@ -205,7 +205,7 @@
}
org.omg.CORBA.ORB theORB = _orb.orb();
- org.omg.PortableServer.POA rootPOA = _oa.rootPoa ();
+ org.omg.PortableServer.POA rootPOA = _oa.rootPoa();
// create direct persistent POA
// make the policy lists, with standard policies
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java 2009-11-10 10:15:17 UTC (rev 30083)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java 2009-11-10 10:24:21 UTC (rev 30084)
@@ -32,7 +32,6 @@
package com.arjuna.orbportability;
import com.arjuna.orbportability.oa.*;
-import com.arjuna.orbportability.event.EventManager;
import com.arjuna.orbportability.logging.opLogger;
import com.arjuna.orbportability.exceptions.FatalError;
@@ -45,14 +44,9 @@
import com.arjuna.orbportability.internal.utils.PostSetLoader;
import java.util.*;
-import java.applet.Applet;
-import java.io.*;
import org.omg.PortableServer.*;
import org.omg.CORBA.Policy;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import org.omg.CORBA.BAD_PARAM;
import org.omg.CORBA.SystemException;
import org.omg.CORBA.ORBPackage.InvalidName;
import org.omg.PortableServer.POAPackage.AdapterAlreadyExists;
@@ -491,7 +485,7 @@
_orbToOAMap.put(associatedORB, oa);
}
-
+
return(oa);
}
More information about the jboss-svn-commits
mailing list