Attachment 27609 Details for Bug 51888 – Patch to put unlock in a finally

[patch] Patch to put unlock in a finally

BUG_51888-PatchTryFinally.patch (text/plain), 1.56 KB, created by Philippe Mouawad on 2011-09-27 14:20:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Mouawad

Created: 2011-09-27 14:20:17 UTC

Size: 1.56 KB

patch

obsolete

>Index: src/core/org/apache/jmeter/threads/JMeterThread.java
>===================================================================
>--- src/core/org/apache/jmeter/threads/JMeterThread.java	(revision 1176336)
>+++ src/core/org/apache/jmeter/threads/JMeterThread.java	(working copy)
>@@ -321,13 +321,17 @@
>             log.error("Test failed!", e);
>         } finally {
>             currentSampler = null; // prevent any further interrupts
>-            interruptLock.lock();  // make sure current interrupt is finished, prevent another starting yet
>-            threadContext.clear();
>-            log.info("Thread finished: " + threadName);
>-            threadFinished(iterationListener);
>-            monitor.threadFinished(this); // Tell the engine we are done
>-            JMeterContextService.removeContext(); // Remove the ThreadLocal entry
>-            interruptLock.unlock(); // Allow any pending interrupt to complete (OK because currentSampler == null)
>+            try {
>+                interruptLock.lock();  // make sure current interrupt is finished, prevent another starting yet
>+                threadContext.clear();
>+                log.info("Thread finished: " + threadName);
>+                threadFinished(iterationListener);
>+                monitor.threadFinished(this); // Tell the engine we are done
>+                JMeterContextService.removeContext(); // Remove the ThreadLocal entry
>+            }
>+            finally {
>+                interruptLock.unlock(); // Allow any pending interrupt to complete (OK because currentSampler == null)
>+            }
>         }
>     }
>

Actions: View | Diff

Attachments on bug 51888: 27584 | 27587 | 27588 | 27589 | 27590 | 27591 | 27599 | 27604 | 27605 | 27606 | 27609