git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'improvement/JAL-3848_slivka_0.8' into alpha/JAL-3066_Jalview_212_slivka...
[jalview.git]
/
src
/
jalview
/
ws
/
slivkaws
/
SlivkaWSDiscoverer.java
diff --git
a/src/jalview/ws/slivkaws/SlivkaWSDiscoverer.java
b/src/jalview/ws/slivkaws/SlivkaWSDiscoverer.java
index
d290024
..
50fa2d6
100644
(file)
--- a/
src/jalview/ws/slivkaws/SlivkaWSDiscoverer.java
+++ b/
src/jalview/ws/slivkaws/SlivkaWSDiscoverer.java
@@
-4,6
+4,8
@@
import jalview.bin.Cache;
import jalview.ws.ServiceChangeListener;
import jalview.ws.WSDiscovererI;
import jalview.ws.api.ServiceWithParameters;
import jalview.ws.ServiceChangeListener;
import jalview.ws.WSDiscovererI;
import jalview.ws.api.ServiceWithParameters;
+import javajs.http.HttpClientFactory;
+
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
@@
-215,7
+217,7
@@
public class SlivkaWSDiscoverer implements WSDiscovererI
{
List<?> services = new SlivkaClient(url).getServices();
return services.isEmpty() ? STATUS_NO_SERVICES : STATUS_OK;
{
List<?> services = new SlivkaClient(url).getServices();
return services.isEmpty() ? STATUS_NO_SERVICES : STATUS_OK;
- } catch (IOException e)
+ } catch (IOException | org.json.JSONException e)
{
Cache.log.error("Slivka could not retrieve services list", e);
return STATUS_INVALID;
{
Cache.log.error("Slivka could not retrieve services list", e);
return STATUS_INVALID;