From 5893333aa9a949f4161629a681b4342335dec418 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Tue, 11 Sep 2007 16:18:28 +0000
Subject: [PATCH] Fix: ensure the LazyPathHandler is kept running when an
unexpected exception occurs
SVN: 1687
---
.../cisd/datamover/utils/LazyPathHandler.java | 27 ++++++++++++-------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/utils/LazyPathHandler.java b/datamover/source/java/ch/systemsx/cisd/datamover/utils/LazyPathHandler.java
index e99308d2ab8..3d5c8c33dc9 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/utils/LazyPathHandler.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/utils/LazyPathHandler.java
@@ -73,21 +73,28 @@ public class LazyPathHandler implements ITerminable, IPathHandler
@Override
public void run()
{
- while (terminate == false)
+ try
{
- try
+ while (terminate == false)
{
- File resource = queue.take(); // blocks if empty
- boolean ok = handler.handle(resource);
- logHandlingResult(resource, ok);
- } catch (InterruptedException ex)
- {
- if (!terminate)
+ try
+ {
+ File resource = queue.take(); // blocks if empty
+ boolean ok = handler.handle(resource);
+ logHandlingResult(resource, ok);
+ } catch (InterruptedException ex)
{
- operationLog.info("Processing was unexpectedly interrupted. Thread stops.");
+ if (!terminate)
+ {
+ operationLog.info("Processing was unexpectedly interrupted. Thread stops.");
+ }
+ return;
}
- return;
}
+ } catch (Exception ex)
+ {
+ // Just log it but ensure that the thread won't die.
+ notificationLog.error("An exception has occurred. (thread still running)", ex);
}
}
--
GitLab