From 11d9613bb34aeec61f6f24287d02cadc2502edc6 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 23 Apr 2020 10:52:45 -0400 Subject: [PATCH] 6267 Condense try-with-resources --- .../autopsy/geolocation/GeoFilterPanel.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.java b/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.java index dcea91c93d..5f47502c58 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.java +++ b/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.java @@ -516,18 +516,17 @@ class GeoFilterPanel extends javax.swing.JPanel { + " or attrs.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_GEO_WAYPOINTS.getTypeID() + " )" + " )"; - try (SleuthkitCase.CaseDbQuery queryResult = sleuthkitCase.executeQuery(queryStr)) { - try (ResultSet resultSet = queryResult.getResultSet()) { - if (resultSet.next()) { - count = resultSet.getLong("count"); - } - } catch (SQLException ex) { - Throwable cause = ex.getCause(); - if (cause != null) { - logger.log(Level.SEVERE, cause.getMessage(), cause); - } else { - logger.log(Level.SEVERE, ex.getMessage(), ex); - } + try (SleuthkitCase.CaseDbQuery queryResult = sleuthkitCase.executeQuery(queryStr); + ResultSet resultSet = queryResult.getResultSet()) { + if (resultSet.next()) { + count = resultSet.getLong("count"); + } + } catch (SQLException ex) { + Throwable cause = ex.getCause(); + if (cause != null) { + logger.log(Level.SEVERE, cause.getMessage(), cause); + } else { + logger.log(Level.SEVERE, ex.getMessage(), ex); } } return count;