X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fjws2%2FJabaWsServerQuery.java;fp=src%2Fjalview%2Fws%2Fjws2%2FJabaWsServerQuery.java;h=2799e98f360f13df3b282a4403cec322d194ea20;hb=ad5a897996c1c6305ecf9e677a2b6026f988dfe2;hp=5ca506538c3f15723265022b942cc79e6b7ad282;hpb=cce8dd5b2737f394593b3a418c7bb1836cf55c57;p=jalview.git diff --git a/src/jalview/ws/jws2/JabaWsServerQuery.java b/src/jalview/ws/jws2/JabaWsServerQuery.java index 5ca5065..2799e98 100644 --- a/src/jalview/ws/jws2/JabaWsServerQuery.java +++ b/src/jalview/ws/jws2/JabaWsServerQuery.java @@ -53,6 +53,7 @@ public class JabaWsServerQuery implements Runnable { if (Jws2Client.validURL(jwsservers)) { + boolean noservices=true; // look for services for (Services srv : Services.values()) { @@ -74,26 +75,35 @@ public class JabaWsServerQuery implements Runnable { e.printStackTrace(); } + // For moment, report service as a problem. + jws2Discoverer.addInvalidServiceUrl(jwsservers); } ; if (service != null) { + noservices=false; jws2Discoverer.addService(jwsservers, srv, service); } } - + if (noservices) + { + jws2Discoverer.addUrlwithnoservices(jwsservers); + } } else { + jws2Discoverer.addInvalidServiceUrl(jwsservers); Cache.log.info("Ignoring invalid Jws2 service url " + jwsservers); } } catch (Exception e) { e.printStackTrace(); Cache.log.warn("Exception when discovering Jws2 services.", e); + jws2Discoverer.addInvalidServiceUrl(jwsservers); } catch (Error e) { Cache.log.error("Exception when discovering Jws2 services.", e); + jws2Discoverer.addInvalidServiceUrl(jwsservers); } running=false; }