Author: tchemit Date: 2012-12-05 00:31:44 +0100 (Wed, 05 Dec 2012) New Revision: 28 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/28 Log: fix service closes Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java 2012-12-04 17:59:54 UTC (rev 27) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java 2012-12-04 23:31:44 UTC (rev 28) @@ -88,20 +88,6 @@ } } - public <S extends TuttiService> void closeService(S service) throws IOException { - - services.invalidate(service.getClass()); - - if (log.isInfoEnabled()) { - log.info("Close service " + service); - } - service.close(); - } - - public void open() { - //TODO - } - @Override public void close() throws IOException { @@ -111,6 +97,6 @@ } IOUtils.closeQuietly(service); } - services.cleanUp(); + services.invalidateAll(); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2012-12-04 17:59:54 UTC (rev 27) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2012-12-04 23:31:44 UTC (rev 28) @@ -185,8 +185,6 @@ public void open() { - serviceContext.open(); - if (surveyId == null) { // load it from config