Merge pull request #59 from schaeferd/master

JndiSqlMap - closed Connection aufter query

Author: Markus M. Geipel

src/main/java/org/culturegraph/mf/morph/maps/JndiSqlMap.java

@@ -13,91 +13,97 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.culturegraph.mf.morph.maps;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-
-import org.culturegraph.mf.exceptions.MorphException;
-
-
-/**
- * @author Daniel
- * 
- */
-public final class JndiSqlMap extends AbstractReadOnlyMap<String, String> implements Closeable {
-
-	private boolean isUninitialized = true;
-	private DataSource datasource;
-	private String query;
+package org.culturegraph.mf.morph.maps;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+import org.culturegraph.mf.exceptions.MorphException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author Daniel
+ * 
+ */
+public final class JndiSqlMap extends AbstractReadOnlyMap<String, String> implements Closeable {
+
+	private static final Logger LOG = LoggerFactory.getLogger(JndiSqlMap.class);
+	private DataSource datasource;
+	private String query;
 	private Connection connection;
-
-	private PreparedStatement preparedStatement;
-
-	public void init() {
-
-		try {
-			connection = datasource.getConnection();
-			this.preparedStatement = connection.prepareStatement(query);
-		} catch (SQLException e) {
-			throw new MorphException(e);
-		}
-		isUninitialized = false;
-	}
-
-	@Override
-	public void close() throws IOException {
-		try {
-			if (connection != null) {
-				connection.close();
-			}
-		} catch (SQLException e) {
-			throw new MorphException(e);
-		}
-	}
-
-	protected DataSource getDatasource() {
-		return datasource;
-	}
-
-	public void setDatasource(final String name) {
-		try {
-			this.datasource = (DataSource) new InitialContext().lookup(name);
-		} catch (NamingException e) {
-			throw new MorphException(e);
-		}
-	}
-
-	public void setQuery(final String query) {
-		this.query = query;
-	}
-
-	@Override
-	public String get(final Object key) {
-		if (isUninitialized) {
-			init();
-		}
-		String resultString = null;
+	
+
+	@Override
+	public void close() throws IOException {
+		try {
+			if (connection != null) {
+				connection.close();
+			}
+		} catch (SQLException e) {
+			throw new MorphException(e);
+		}
+	}
+
+	protected DataSource getDatasource() {
+		return datasource;
+	}
+
+	public void setDatasource(final String name) {
+		try {
+			this.datasource = (DataSource) new InitialContext().lookup(name);
+		} catch (NamingException e) {
+			throw new MorphException(e);
+		}
+	}
+
+	public void setQuery(final String query) {
+		this.query = query;
+	}
+
+	@Override
+	public String get(final Object key) {
+		String resultString = null;
 		final ResultSet resultSet;
+		PreparedStatement stmt = null;
+		Connection con = null;
 		try {
-			preparedStatement.setString(1, key.toString());
-			resultSet = preparedStatement.executeQuery();
-			if (resultSet.first()) {
-				resultString = resultSet.getString(1);
+			con = datasource.getConnection();
+			stmt = con.prepareStatement(query);
+			stmt.setString(1, key.toString());
+			resultSet = stmt.executeQuery();
+			if (resultSet.first()) {
+				resultString = resultSet.getString(1);
+			}
+			resultSet.close();
+		} catch (SQLException e) {
+			throw new MorphException(e);
+		} finally {
+			if(stmt != null){
+				try {
+					stmt.close();
+				} catch (SQLException e) {
+					LOG.error("Can't close SQL-Statement.", e);
+				}
+			}
+			if(con != null){
+				try {
+					con.close();
+				} catch (SQLException e) {
+					LOG.error("Can't close Connection.", e);
+				}
 			}
-			resultSet.close();
-		} catch (SQLException e) {
-			throw new MorphException(e);
-		}
-		return resultString;
-	}
-
-}
+		}
+		return resultString;
+	}
+
+}