Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/MeasurementFactory.java @ 8566:fe7e9da6312a
(issue1797) Move close into session release and guard it.
To avoid leaking open and Held sessions we centrally close
the session in the SessionHolder on release.
This also removes some duplicated code in SedDBSessionHolder
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Tue, 24 Feb 2015 17:16:14 +0100 |
| parents | 84929f882fa2 |
| children | 2e11fc7f5d35 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/MeasurementFactory.java Tue Feb 17 13:58:23 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/MeasurementFactory.java Tue Feb 24 17:16:14 2015 +0100 @@ -258,18 +258,13 @@ SQ.Factory sqFactory ) { Session session = SedDBSessionHolder.HOLDER.get(); - try { - List<Measurement> totals = loadTotals( - session, river, location, dateRange); + List<Measurement> totals = loadTotals( + session, river, location, dateRange); - List<Measurement> accumulated = loadFractions( - session, river, location, dateRange); + List<Measurement> accumulated = loadFractions( + session, river, location, dateRange); - return new Measurements(totals, accumulated, sqFactory); - } - finally { - session.close(); - } + return new Measurements(totals, accumulated, sqFactory); } @SuppressWarnings("unchecked")