X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2Fjabaws2%2FJws2Instance.java;h=e092192d400e7d6860749eef09a7c554c4bad614;hb=feeb56fc2f3d7c40a46466ff52c7663cc96d6c70;hp=61ff7ebbf4354c9c93ad25e98afe659f7c87b49f;hpb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;p=jalview.git diff --git a/src/jalview/ws/jws2/jabaws2/Jws2Instance.java b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java index 61ff7eb..e092192 100644 --- a/src/jalview/ws/jws2/jabaws2/Jws2Instance.java +++ b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java @@ -38,7 +38,7 @@ import compbio.data.msa.SequenceAnnotation; import compbio.metadata.PresetManager; import compbio.metadata.RunnerConfig; -public class Jws2Instance +public class Jws2Instance implements AutoCloseable { public String hosturl; @@ -159,25 +159,24 @@ public class Jws2Instance } throw new Error(MessageManager.formatMessage( "error.implementation_error_runner_config_not_available", - new String[] { serviceType, service.getClass().toString() })); + new String[] + { serviceType, service.getClass().toString() })); } @Override - protected void finalize() throws Throwable + public void close() { if (service != null) { try { - Closeable svc = (Closeable) service; - service = null; - svc.close(); - } catch (Exception e) + ((Closeable) service).close(); + } catch (Throwable t) { + // ignore } - ; } - super.finalize(); + // super.finalize(); } public ParamDatastoreI getParamStore() @@ -204,7 +203,8 @@ public class Jws2Instance // this is only valid for Jaba 1.0 - this formula might have to change! return hosturl + (hosturl.lastIndexOf("/") == (hosturl.length() - 1) ? "" - : "/") + serviceType; + : "/") + + serviceType; } private boolean hasParams = false, lookedForParams = false;