summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-08-23 06:30:43 (EDT)
committerEike Stepper2006-08-23 06:30:43 (EDT)
commit3c5c7f1b721cc456ef0ec08133bc331f8b9879e1 (patch)
treeb62dc04688b8b87a040b8b7395cf7c8f65aaa696
parentb39800752e0296fb38a2b58e9382c6362f110be1 (diff)
downloadcdo-3c5c7f1b721cc456ef0ec08133bc331f8b9879e1.zip
cdo-3c5c7f1b721cc456ef0ec08133bc331f8b9879e1.tar.gz
cdo-3c5c7f1b721cc456ef0ec08133bc331f8b9879e1.tar.bz2
[154522] Copy from CDO resource to XMI resource does not work
https://bugs.eclipse.org/bugs/show_bug.cgi?id=154389
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/thread/DeadlockDetector.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/thread/DeadlockDetector.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/thread/DeadlockDetector.java
index 7aaa1e4..15f1495 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/thread/DeadlockDetector.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/thread/DeadlockDetector.java
@@ -61,11 +61,16 @@ public final class DeadlockDetector
public static void wait(Object object) throws ThreadInterruptedException
{
+ wait(object, 0);
+ }
+
+ public static void wait(Object object, long timeout) throws ThreadInterruptedException
+ {
preLock();
try
{
- object.wait();
+ object.wait(timeout);
}
catch (InterruptedException ex)
{