From 99b17092e41affc5ead771669a4e9a059d22e25e Mon Sep 17 00:00:00 2001 From: Fredrik Osterlind Date: Wed, 2 May 2012 16:04:16 +0200 Subject: [PATCH] bugfixed race condition --- .../cooja/java/se/sics/cooja/plugins/LogScriptEngine.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java b/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java index 9bdd615e7..dbb761232 100644 --- a/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java +++ b/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java @@ -116,15 +116,17 @@ public class LogScriptEngine { /* Only called from the simulation loop */ private void stepScript() { /* Release script - halt simulation */ - if (semaphoreScript == null || semaphoreSim == null) { + Semaphore semScript = semaphoreScript; + Semaphore semSim = semaphoreSim; + if (semScript == null || semSim == null) { return; } - semaphoreScript.release(); + semScript.release(); /* ... script executing ... */ try { - semaphoreSim.acquire(); + semSim.acquire(); } catch (InterruptedException e1) { e1.printStackTrace(); }