svn commit: r1704614 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java

[reschke]

Author: reschke
Date: Tue Sep 22 13:01:30 2015
New Revision: 1704614

URL: http://svn.apache.org/viewvc?rev=1704614&view=rev
Log:
OAK-3438: RDDocumentStoreDB - fix one time ResultSet leak (and remove unused 
imports)

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java?rev=1704614&r1=1704613&r2=1704614&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
 Tue Sep 22 13:01:30 2015
@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.oak.plugins.document.rdb;
 
-import java.lang.reflect.InvocationTargetException;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
@@ -29,7 +28,6 @@ import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Nonnull;
-import javax.sql.DataSource;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -237,6 +235,7 @@ public enum RDBDocumentStoreDB {
                 while (rs.next()) {
                     result.put("collation", rs.getString("Collation"));
                 }
+                rs.close();
                 stmt.close();
                 stmt = con.prepareStatement(
                         "SHOW VARIABLES WHERE variable_name LIKE 
'character\\_set\\_%' OR variable_name LIKE 'collation%' OR variable_name = 
'max_allowed_packet'");