[jboss-svn-commits] JBL Code SVN: r31515 - in labs/jbosstm/trunk/ArjunaCore/arjuna: classes/com/arjuna/ats/arjuna/coordinator and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 9 11:28:24 EST 2010
Author: mark.little at jboss.com
Date: 2010-02-09 11:28:23 -0500 (Tue, 09 Feb 2010)
New Revision: 31515
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/tools/log/EditableAtomicAction.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/CrashRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/tools/LogEditorUnitTest.java
Log:
https://jira.jboss.org/jira/browse/JBTM-698
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml 2010-02-09 13:07:06 UTC (rev 31514)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml 2010-02-09 16:28:23 UTC (rev 31515)
@@ -114,6 +114,9 @@
<include name="coverage.ec"/>
<include name="metadata.emma"/>
</fileset>
+ <sourcepath>
+ <dirset dir="${src.dir}"/>
+ </sourcepath>
<txt outfile="${basedir}/${build.dir}/emma/coverage.txt" />
<html outfile="${basedir}/${build.dir}/emma/coverage.html" />
</report>
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2010-02-09 13:07:06 UTC (rev 31514)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2010-02-09 16:28:23 UTC (rev 31515)
@@ -1865,8 +1865,6 @@
if (!reportHeuristics && TxControl.asyncCommit
&& (parentAction == null))
{
- System.err.println("**here");
-
AsyncCommit.create(this, true);
}
else
@@ -2639,7 +2637,7 @@
if (state.notempty())
{
try
- {
+ {
if (!currentStore.write_committed(u, tn, state))
{
if (tsLogger.arjLoggerI18N.isWarnEnabled())
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2010-02-09 13:07:06 UTC (rev 31514)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2010-02-09 16:28:23 UTC (rev 31515)
@@ -26,7 +26,6 @@
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.ats.arjuna.common.arjPropertyManager;
-import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.objectstore.ObjectStoreType;
import com.arjuna.ats.arjuna.objectstore.StateStatus;
import com.arjuna.ats.arjuna.objectstore.StateType;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java 2010-02-09 13:07:06 UTC (rev 31514)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java 2010-02-09 16:28:23 UTC (rev 31515)
@@ -31,7 +31,6 @@
package com.arjuna.ats.internal.arjuna.objectstore;
-import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.objectstore.ObjectStoreType;
import com.arjuna.ats.arjuna.objectstore.StateStatus;
import com.arjuna.ats.arjuna.objectstore.StateType;
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/tools/log/EditableAtomicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/tools/log/EditableAtomicAction.java 2010-02-09 13:07:06 UTC (rev 31514)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/tools/log/EditableAtomicAction.java 2010-02-09 16:28:23 UTC (rev 31515)
@@ -47,7 +47,7 @@
public void moveHeuristicToPrepared (int index) throws IndexOutOfBoundsException
{
- if ((index < 0) || (super.heuristicList.size() < index))
+ if ((index < 0) || (index > super.heuristicList.size()))
throw new IndexOutOfBoundsException();
else
{
@@ -101,7 +101,7 @@
public void deleteHeuristicParticipant (int index) throws IndexOutOfBoundsException
{
- if ((index < 0) || (super.heuristicList.size() < index))
+ if ((index < 0) || (index > super.heuristicList.size()))
throw new IndexOutOfBoundsException();
else
{
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/CrashRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/CrashRecord.java 2010-02-09 13:07:06 UTC (rev 31514)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/CrashRecord.java 2010-02-09 16:28:23 UTC (rev 31515)
@@ -135,12 +135,12 @@
public boolean save_state(OutputObjectState os, int ot)
{
- return true;
+ return super.save_state(os, ot);
}
public boolean restore_state(InputObjectState os, int ot)
{
- return true;
+ return super.restore_state(os, ot);
}
public String type()
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/tools/LogEditorUnitTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/tools/LogEditorUnitTest.java 2010-02-09 13:07:06 UTC (rev 31514)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/tools/LogEditorUnitTest.java 2010-02-09 16:28:23 UTC (rev 31515)
@@ -22,18 +22,44 @@
package com.hp.mwtests.ts.arjuna.tools;
import com.arjuna.ats.arjuna.AtomicAction;
+import com.arjuna.ats.arjuna.common.arjPropertyManager;
import com.arjuna.ats.arjuna.coordinator.ActionStatus;
+import com.arjuna.ats.arjuna.coordinator.RecordType;
+import com.arjuna.ats.arjuna.coordinator.abstractrecord.RecordTypeManager;
+import com.arjuna.ats.arjuna.coordinator.abstractrecord.RecordTypeMap;
+import com.arjuna.ats.arjuna.objectstore.StateType;
+import com.arjuna.ats.internal.arjuna.tools.log.EditableAtomicAction;
import com.hp.mwtests.ts.arjuna.resources.CrashRecord;
import org.junit.Test;
import static org.junit.Assert.*;
+class DummyMap2 implements RecordTypeMap
+{
+ @SuppressWarnings("unchecked")
+ public Class getRecordClass ()
+ {
+ return CrashRecord.class;
+ }
+
+ public int getType ()
+ {
+ return RecordType.USER_DEF_FIRST0;
+ }
+}
+
public class LogEditorUnitTest
{
@Test
public void test () throws Exception
{
+ String localOSRoot = "foobar";
+ String objectStoreDir = System.getProperty("java.io.tmpdir")+"/bar";
+
+ arjPropertyManager.getObjectStoreEnvironmentBean().setLocalOSRoot(localOSRoot);
+ arjPropertyManager.getObjectStoreEnvironmentBean().setObjectStoreDir(objectStoreDir);
+
// dummy to set up ObjectStore
AtomicAction A = new AtomicAction();
@@ -71,5 +97,35 @@
System.out.println("Transaction " + B + " committed with "
+ ActionStatus.stringForm(outcome));
+
+ RecordTypeManager.manager().add(new DummyMap2());
+
+ EditableAtomicAction eaa = new EditableAtomicAction(B.get_uid());
+
+ assertTrue(eaa.toString() != null);
+
+ eaa.moveHeuristicToPrepared(0);
+
+ try
+ {
+ eaa.moveHeuristicToPrepared(-1);
+ fail();
+ }
+ catch (final Exception ex)
+ {
+ }
+
+ eaa = new EditableAtomicAction(A.get_uid());
+
+ eaa.deleteHeuristicParticipant(0);
+
+ try
+ {
+ eaa.deleteHeuristicParticipant(-1);
+ fail();
+ }
+ catch (final Exception ex)
+ {
+ }
}
}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list