From d581afdfd4654d0f431dfb8d1b52775764646fdc Mon Sep 17 00:00:00 2001 From: pmarguerite Date: Fri, 18 May 2007 15:14:51 +0000 Subject: [PATCH] VamsasSession: fixed incorrectly stopping the EventGeneratorThread git-svn-id: https://svn.lifesci.dundee.ac.uk/svn/repository/trunk@396 be28352e-c001-0410-b1a7-c7978e42abec --- src/uk/ac/vamsas/client/simpleclient/VamsasSession.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/uk/ac/vamsas/client/simpleclient/VamsasSession.java b/src/uk/ac/vamsas/client/simpleclient/VamsasSession.java index dcffe57..5714bcd 100644 --- a/src/uk/ac/vamsas/client/simpleclient/VamsasSession.java +++ b/src/uk/ac/vamsas/client/simpleclient/VamsasSession.java @@ -228,7 +228,7 @@ public class VamsasSession { * make a new watcher object for the clientFile * @return new ClientFile watcher instance */ - public FileWatcher getClientWatcher() { + public FileWatcher getClientWatcher() { return new FileWatcher(clist.sessionFile); } /** @@ -536,11 +536,14 @@ public class VamsasSession { // client.evgen._raise(Events.DOCUMENT_FINALIZEAPPDATA, null, client,null); // / } - log.debug("Stopping EventGenerator.."); - client.evgen.stopWatching(); + } + log.debug("Stopping EventGenerator.."); + client.evgen.stopWatching(); + watcher.setHandler(null);//Do not check if the client is the last client. watcher will shutdown anyway - + // watcher.haltWatch(); + // watcher. return false; } } -- 1.7.10.2