Fixing jdbc code: correct Statement closing
Change-Id: Iebba6cc02c311b4649d93ddc4a1f224efa643ba4
diff --git a/gerrit-war/src/main/java/com/google/gerrit/httpd/SiteInitializer.java b/gerrit-war/src/main/java/com/google/gerrit/httpd/SiteInitializer.java
index 0948c46..0a9386d 100644
--- a/gerrit-war/src/main/java/com/google/gerrit/httpd/SiteInitializer.java
+++ b/gerrit-war/src/main/java/com/google/gerrit/httpd/SiteInitializer.java
@@ -23,13 +23,14 @@
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Statement;
public final class SiteInitializer {
- private static final Logger log = LoggerFactory
+ private static final Logger LOG = LoggerFactory
.getLogger(SiteInitializer.class);
- final String sitePath;
- final String initPath;
+ private final String sitePath;
+ private final String initPath;
SiteInitializer(String sitePath, String initPath) {
this.sitePath = sitePath;
@@ -38,10 +39,9 @@
public void init() {
try {
-
if (sitePath != null) {
File site = new File(sitePath);
- log.info(String.format("Initializing site at %s",
+ LOG.info(String.format("Initializing site at %s",
site.getAbsolutePath()));
new BaseInit(site, false).run();
return;
@@ -53,9 +53,8 @@
if (site == null && initPath != null) {
site = new File(initPath);
}
-
if (site != null) {
- log.info(String.format("Initializing site at %s",
+ LOG.info(String.format("Initializing site at %s",
site.getAbsolutePath()));
new BaseInit(site, new ReviewDbDataSourceProvider(), false).run();
}
@@ -63,7 +62,7 @@
conn.close();
}
} catch (Exception e) {
- log.error("Site init failed", e);
+ LOG.error("Site init failed", e);
throw new RuntimeException(e);
}
}
@@ -74,10 +73,14 @@
private File getSiteFromReviewDb(Connection conn) {
try {
- ResultSet rs = conn.createStatement().executeQuery(
- "select site_path from system_config");
- if (rs.next()) {
- return new File(rs.getString(1));
+ Statement stmt = conn.createStatement();
+ try {
+ ResultSet rs = stmt.executeQuery("SELECT site_path FROM system_config");
+ if (rs.next()) {
+ return new File(rs.getString(1));
+ }
+ } finally {
+ stmt.close();
}
return null;
} catch (SQLException e) {
