From 6bcb3d003991530f5be8ffe0a25e17cc92823942 Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Thu, 20 Apr 2017 10:28:32 -0400 Subject: [PATCH] Close context in a finally --- .../com/moparisthebest/jdbc/QueryMapper.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/QueryMapper.java b/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/QueryMapper.java index a9907f5..0fdfbc6 100644 --- a/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/QueryMapper.java +++ b/beehive-jdbc-mapper/src/main/java/com/moparisthebest/jdbc/QueryMapper.java @@ -33,15 +33,16 @@ public class QueryMapper implements Closeable { this.cm = cm == null ? new ResultSetMapper() : cm; Context context = null; if (conn == null && jndiName != null) - try { - context = new InitialContext(); - DataSource ds = (DataSource) context.lookup(jndiName); - conn = ds.getConnection(); - } catch (Throwable e) { - e.printStackTrace(); - tryClose(conn); - tryClose(context); - } + try { + context = new InitialContext(); + DataSource ds = (DataSource) context.lookup(jndiName); + conn = ds.getConnection(); + } catch (Throwable e) { + e.printStackTrace(); + tryClose(conn); + } finally { + tryClose(context); + } this.conn = conn; this.context = context; if (this.conn == null)