change test lockTimeout #3

h2/src/main/org/h2/mvstore/tx/Transaction.java

@@ -142,7 +142,7 @@ public class Transaction {
     /**
      * Map on which this transaction is blocked.
      */
-    MVMap blockingMap;
+    MVMap<?,VersionedValue> blockingMap;
 
     /**
      * Key in blockingMap on which this transaction is blocked.

h2/src/main/org/h2/mvstore/tx/TransactionStore.java

@@ -228,7 +228,7 @@ public class TransactionStore {
      * @param logId the log id
      * @return the operation id
      */
-    private static long getOperationId(int transactionId, long logId) {
+    static long getOperationId(int transactionId, long logId) {
         DataUtils.checkArgument(transactionId >= 0 && transactionId < (1 << (64 - LOG_ID_BITS)),
                 "Transaction id out of range: {0}", transactionId);
         DataUtils.checkArgument(logId >= 0 && logId <= LOG_ID_MASK,

h2/src/test/org/h2/test/db/TestIndex.java

@@ -51,7 +51,13 @@ public class TestIndex extends TestBase {
         testHashIndexOnMemoryTable();
         testErrorMessage();
         testDuplicateKeyException();
-        testConcurrentUpdate();
+        int to = config.lockTimeout;
+        config.lockTimeout = 50000;
+        try {
+            testConcurrentUpdate();
+        } finally {
+            config.lockTimeout = to;
+        }
         testNonUniqueHashIndex();
         testRenamePrimaryKey();
         testRandomized();