From 97e60bc9169500213a156cbe80f8669512c45fc0 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Sat, 7 Apr 2007 20:24:48 +0000 Subject: [PATCH] [180994] I can't reproduce this problem but there was a locking problem recently discovered in version 7 RSE. I've put the fix here although I can't be sure if it fixes the problem Dave D and Martin are seeing. --- .../src/org/eclipse/dstore/core/miners/Miner.java | 1 + .../src/org/eclipse/dstore/core/model/CommandHandler.java | 4 ++-- .../src/org/eclipse/dstore/core/model/UpdateHandler.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/Miner.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/Miner.java index c1d7d4d0636..2ade08d6f06 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/Miner.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/Miner.java @@ -203,6 +203,7 @@ implements ISchemaExtender DataElement cmd = (DataElement)_commandQueue.remove(0); command(cmd); } + waitForInput(); } public final void requestCommand(DataElement command) diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java index 493f3875c8b..fbdfec6aeec 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java @@ -91,9 +91,9 @@ public abstract class CommandHandler extends Handler { _commands.add(command); } - } - notifyInput(); + } } + notifyInput(); } /** diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java index 04595e246b0..0c939e94229 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java @@ -155,9 +155,9 @@ public abstract class UpdateHandler extends Handler } } } - } - notifyInput(); + } } + notifyInput(); } /**