summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-12-31 05:43:30 (EST)
committerEike Stepper2007-12-31 05:43:30 (EST)
commit34f133d18a81e936af03e0d90611d18ddcc012c6 (patch)
treebf4d381a12387eda8be4cddfdf7fd754efa92a97
parent15fdbf45b21b5fd9fc768a8962e0f188593ea9d5 (diff)
downloadcdo-34f133d18a81e936af03e0d90611d18ddcc012c6.zip
cdo-34f133d18a81e936af03e0d90611d18ddcc012c6.tar.gz
cdo-34f133d18a81e936af03e0d90611d18ddcc012c6.tar.bz2
[213782] Transaction DeadLock
https://bugs.eclipse.org/bugs/show_bug.cgi?id=213782
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionDeadLockTest.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java2
-rw-r--r--plugins/org.eclipse.net4j.tcp/.options2
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java2
5 files changed, 10 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java
index 6effb97..e6bce97 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java
@@ -21,7 +21,7 @@ import java.io.IOException;
/**
* @author Eike Stepper
*/
-public class ViewsChangedIndication extends CDOServerIndication
+public class ViewsChangedIndication extends CDOServerIndication // Indication
{
public ViewsChangedIndication()
{
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionDeadLockTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionDeadLockTest.java
index 6bd684b..dbef56b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionDeadLockTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionDeadLockTest.java
@@ -29,6 +29,12 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
public class TransactionDeadLockTest extends AbstractCDOTest
{
@Override
+ protected boolean useJVMTransport()
+ {
+ return false;
+ }
+
+ @Override
protected void doSetUp() throws Exception
{
super.doSetUp();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java
index d62fbe9..61de48e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java
@@ -21,7 +21,7 @@ import java.io.IOException;
/**
* @author Eike Stepper
*/
-public class ViewsChangedRequest extends CDOClientRequest<Boolean>
+public class ViewsChangedRequest extends CDOClientRequest<Boolean> // Request
{
private int viewID;
diff --git a/plugins/org.eclipse.net4j.tcp/.options b/plugins/org.eclipse.net4j.tcp/.options
index 6a621c5..6dd14bc 100644
--- a/plugins/org.eclipse.net4j.tcp/.options
+++ b/plugins/org.eclipse.net4j.tcp/.options
@@ -2,4 +2,4 @@
org.eclipse.net4j.tcp/debug = true
-org.eclipse.net4j.tcp/protocol.registration.timeout = 5000
+org.eclipse.net4j.tcp/protocol.registration.timeout = 10000
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
index ac84aab..3725ce3 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
@@ -27,7 +27,7 @@ public abstract class OM
public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
- public static final int PROTOCOL_REGISTRATION_TIMEOUT = BUNDLE.getDebugOption("protocol.registration.timeout", 5000); //$NON-NLS-1$
+ public static final int PROTOCOL_REGISTRATION_TIMEOUT = BUNDLE.getDebugOption("protocol.registration.timeout", 10000); //$NON-NLS-1$
public static final OMLogger LOG = BUNDLE.logger();