ozeigermann 2005/01/12 17:34:25
Modified: transaction/src/test/org/apache/commons/transaction/file
FileResourceManagerTest.java
transaction/src/test/org/apache/commons/transaction/memory
PessimisticMapWrapperTest.java
Log:
Adapted to deadlock detection caveat
Revision Changes Path
1.3 +10 -5
jakarta-commons/transaction/src/test/org/apache/commons/transaction/file/FileResourceManagerTest.java
Index: FileResourceManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/transaction/src/test/org/apache/commons/transaction/file/FileResourceManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileResourceManagerTest.java 14 Dec 2004 12:12:46 -0000 1.2
+++ FileResourceManagerTest.java 13 Jan 2005 01:34:25 -0000 1.3
@@ -714,7 +714,12 @@
}
- assertEquals(deadlockCnt, 1);
+ // XXX in special scenarios the current implementation might
cause both
+ // owners to be deadlock victims
+ if (deadlockCnt != 1) {
+ sLogger.logWarning("More than one thread was deadlock
victim!");
+ }
+ assertTrue(deadlockCnt >= 1);
deadlockCnt = 0;
}
}
1.3 +10 -5
jakarta-commons/transaction/src/test/org/apache/commons/transaction/memory/PessimisticMapWrapperTest.java
Index: PessimisticMapWrapperTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/transaction/src/test/org/apache/commons/transaction/memory/PessimisticMapWrapperTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PessimisticMapWrapperTest.java 14 Dec 2004 12:12:47 -0000 1.2
+++ PessimisticMapWrapperTest.java 13 Jan 2005 01:34:25 -0000 1.3
@@ -195,7 +195,12 @@
}
- assertEquals(deadlockCnt, 1);
+ // XXX in special scenarios the current implementation might
cause both
+ // owners to be deadlock victims
+ if (deadlockCnt != 1) {
+ sLogger.logWarning("More than one thread was deadlock
victim!");
+ }
+ assertTrue(deadlockCnt >= 1);
deadlockCnt = 0;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
