Permalink
Browse files

Merge remote branch 'ssinger/master'

  • Loading branch information...
2 parents 4dba93c + 31482ec commit d87fd75ecdcc4248d18120fa7751692da96dd91b @ssinger ssinger committed Jun 10, 2011
Showing with 11 additions and 10 deletions.
  1. +11 −10 src/info/slony/clustertest/testcoordinator/script/ClientScript.java
@@ -175,10 +175,11 @@ public void run() {
*
*/
private void invokeScript() {
+ final ClientScript myClientScript=this;
try {
StringReader reader = new StringReader(javascript);
- final ClientScript myClientScript=this;
+
//Start a thread to monitor outPipeStream.
log.info("Launching a script");
@@ -206,15 +207,7 @@ private void invokeScript() {
log.error("interrupted exception waiting for a stream monitor to finish",e);
}
client.stop();
-
-
- Event finishedEvent = new Event();
- finishedEvent.source=myClientScript;
- finishedEvent.eventName=Coordinator.EVENT_FINISHED;
- coordinator.queueEvent(finishedEvent);
- synchronized(this) {
- isFinished=true;
- }
+
}
@@ -223,6 +216,14 @@ private void invokeScript() {
log.error("ioexception:",e);
}
finally {
+
+ Event finishedEvent = new Event();
+ finishedEvent.source=myClientScript;
+ finishedEvent.eventName=Coordinator.EVENT_FINISHED;
+ coordinator.queueEvent(finishedEvent);
+ synchronized(this) {
+ isFinished=true;
+ }
coordinator.scriptComplete(this);
}

0 comments on commit d87fd75

Please sign in to comment.