From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Tue, 3 Sep 2013 13:27:54 +0000 (+0100)
Subject: Merge branch 'JAL-1373_precision' into RNAalifold
X-Git-Tag: Jalview_2_9~200^2~21^2~10
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3e462b3323ccf43864d73d6cdfccd0fd84301a30;hp=-c;p=jalview.git

Merge branch 'JAL-1373_precision' into RNAalifold
---

3e462b3323ccf43864d73d6cdfccd0fd84301a30
diff --combined src/jalview/ws/jws2/Jws2Discoverer.java
index cb700bc,2724d29..32e9ad5
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@@ -126,8 -126,6 +126,8 @@@ public class Jws2Discoverer implements 
        Cache.log.debug("Old discovery thread has finished.");
      }
      running = true;
 +    
 +    
      changeSupport.firePropertyChange("services", services, new Vector());
      oldthread = Thread.currentThread();
      try
@@@ -191,7 -189,9 +191,9 @@@
        ;
        for (JabaWsServerQuery squery : qrys)
        {
-         finished = finished && !squery.isRunning();
+         if (squery.isRunning()){
+           finished=false;
+         }
        }
        if (aborted)
        {