Author: echatellier Date: 2014-04-24 10:11:01 +0200 (Thu, 24 Apr 2014) New Revision: 3974 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3974 Log: Fix finalize Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java trunk/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2014-04-18 13:54:36 UTC (rev 3973) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2014-04-24 08:11:01 UTC (rev 3974) @@ -366,8 +366,11 @@ */ @Override protected void finalize() throws Throwable { - super.finalize(); - closeStorage(); + try { + closeStorage(); + } finally { + super.finalize(); + } } } Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2014-04-18 13:54:36 UTC (rev 3973) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2014-04-24 08:11:01 UTC (rev 3974) @@ -442,8 +442,11 @@ @Override protected void finalize() throws Throwable { - super.finalize(); - raf.close(); + try { + raf.close(); + } finally { + super.finalize(); + } } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2014-04-18 13:54:36 UTC (rev 3973) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2014-04-24 08:11:01 UTC (rev 3974) @@ -158,8 +158,11 @@ @Override protected void finalize() throws Throwable { - super.finalize(); - close(); + try { + close(); + } finally { + super.finalize(); + } } /** Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java 2014-04-18 13:54:36 UTC (rev 3973) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java 2014-04-24 08:11:01 UTC (rev 3974) @@ -339,8 +339,11 @@ @Override protected void finalize() throws Throwable { - super.finalize(); - close(); + try { + close(); + } finally { + super.finalize(); + } } protected void ensureOpen() {