Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-07-08 01:39:38 -0400
committerEike Stepper2011-07-08 01:39:38 -0400
commitd342a3d137eabb2d2dafafc27673fdd076eae11c (patch)
treebc47dede2a49327fc13a7ba4e5f2787876d3e76b /plugins
parent6dc1619bac5764a7c0e00294d46974e07d91953f (diff)
downloadcdo-d342a3d137eabb2d2dafafc27673fdd076eae11c.tar.gz
cdo-d342a3d137eabb2d2dafafc27673fdd076eae11c.tar.xz
cdo-d342a3d137eabb2d2dafafc27673fdd076eae11c.zip
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionTest.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionTest.java
index 4a66d3d4f3..71ed5d3673 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionTest.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.internal.net4j.protocol.CommitTransactionRequest;
+import org.eclipse.emf.cdo.net4j.CDONet4jSession;
import org.eclipse.emf.cdo.server.IRepository;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.spi.common.commit.CDOCommitInfoUtil;
@@ -471,7 +472,7 @@ public class TransactionTest extends AbstractCDOTest
{
public void handleCommitInfo(CDOCommitInfo commitInfo)
{
- sleep(15L * 1000L);
+ sleep(3000L);
}
};
@@ -481,6 +482,11 @@ public class TransactionTest extends AbstractCDOTest
try
{
CDOSession session = openSession();
+ if (session instanceof CDONet4jSession)
+ {
+ ((CDONet4jSession)session).options().setCommitTimeout(1);
+
+ }
CDOTransaction transaction = session.openTransaction();
CDOResource resource = transaction.getOrCreateResource(getResourcePath("/test1"));
resource.getContents().add(getModel1Factory().createCompany());

Back to the top