X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fjws2%2Fjabaws2%2FJws2Instance.java;h=2f3c2988feaf039185c224d9351e9109673fab5c;hb=1a04478ca5d5fa6bae27f8e7220df5b57fe1c698;hp=a1307f5883672803172b6b9c179887dfdbc761ed;hpb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;p=jalview.git diff --git a/src/jalview/ws/jws2/jabaws2/Jws2Instance.java b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java index a1307f5..2f3c298 100644 --- a/src/jalview/ws/jws2/jabaws2/Jws2Instance.java +++ b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -159,7 +159,8 @@ 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 @@ -169,13 +170,11 @@ public class Jws2Instance { try { - Closeable svc = (Closeable) service; - service = null; - svc.close(); - } catch (Exception e) + ((Closeable) service).close(); + } catch (Throwable t) { + // ignore } - ; } super.finalize(); } @@ -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;