Skip to main content

This CGIT instance is deprecated, and repositories have been moved to Gitlab or Github. See the repository descriptions for specific locations.

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2009-06-06 12:52:39 +0000
committerEike Stepper2009-06-06 12:52:39 +0000
commit85e2476093a93735591425a95af28ef5d0da1fce (patch)
tree6330939ed45ea59095bb57819f9467d761cb557e
parent63ffff988580e32c644cb2c442d27781eb44a954 (diff)
downloadcdo-85e2476093a93735591425a95af28ef5d0da1fce.tar.gz
cdo-85e2476093a93735591425a95af28ef5d0da1fce.tar.xz
cdo-85e2476093a93735591425a95af28ef5d0da1fce.zip
[242005] Provide a HeartBeatPotocol
https://bugs.eclipse.org/bugs/show_bug.cgi?id=242005
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Timeouter.java3
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/TimeoutMonitor.java4
-rw-r--r--plugins/org.eclipse.net4j/.options1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java4
4 files changed, 5 insertions, 7 deletions
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Timeouter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Timeouter.java
index 11a159b902..0a1c771631 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Timeouter.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Timeouter.java
@@ -49,8 +49,9 @@ public abstract class Timeouter
{
if (timeoutTask != null)
{
- timeoutTask.cancel();
+ TimerTask task = timeoutTask;
timeoutTask = null;
+ task.cancel();
}
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/TimeoutMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/TimeoutMonitor.java
index eef506855c..35e5a9f5ec 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/TimeoutMonitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/TimeoutMonitor.java
@@ -53,8 +53,6 @@ public class TimeoutMonitor extends Monitor
@Override
public OMMonitor begin(double totalWork)
{
- touch();
- super.begin(totalWork);
timeouter = new Timeouter(getTimer(), timeout)
{
@Override
@@ -64,6 +62,8 @@ public class TimeoutMonitor extends Monitor
}
};
+ touch();
+ super.begin(totalWork);
return this;
}
diff --git a/plugins/org.eclipse.net4j/.options b/plugins/org.eclipse.net4j/.options
index f2bb0e447d..e092c3d4d3 100644
--- a/plugins/org.eclipse.net4j/.options
+++ b/plugins/org.eclipse.net4j/.options
@@ -4,7 +4,6 @@ org.eclipse.net4j/debug = true
org.eclipse.net4j/debug.buffer = true
org.eclipse.net4j/debug.buffer.stream = false
org.eclipse.net4j/debug.channel = true
-org.eclipse.net4j/debug.selector = true
org.eclipse.net4j/debug.acceptor = true
org.eclipse.net4j/debug.connector = true
org.eclipse.net4j/debug.signal = true
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
index a02637194d..10650b2d22 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -35,8 +35,6 @@ public abstract class OM
public static final OMTracer DEBUG_CHANNEL = DEBUG.tracer("channel"); //$NON-NLS-1$
- public static final OMTracer DEBUG_SELECTOR = DEBUG.tracer("selector"); //$NON-NLS-1$
-
public static final OMTracer DEBUG_ACCEPTOR = DEBUG.tracer("acceptor"); //$NON-NLS-1$
public static final OMTracer DEBUG_CONNECTOR = DEBUG.tracer("connector"); //$NON-NLS-1$

Back to the top