Skip to content

SPARK-2869 - Fix tiny bug in JdbcRdd for closing jdbc connection #1792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

SPARK-2869 - Fix tiny bug in JdbcRdd for closing jdbc connection #1792

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
095b2c9
Fix tiny bug (likely copy and paste error) in closing jdbc connection
Aug 5, 2014
3fb23ed
SPARK-2689 Fix potential leak of connection/PreparedStatement in case…
Aug 5, 2014
6518d36
SPARK-2689 Fix tiny bug in JdbcRdd for closing jdbc connection
Aug 5, 2014
363be4f
SPARK-2869 - Fix tiny bug in JdbcRdd for closing jdbc connection (ref…
javadba Aug 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions core/src/main/scala/org/apache/spark/rdd/JdbcRDD.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,23 @@ class JdbcRDD[T: ClassTag](

override def close() {
try {
if (null != rs && ! rs.isClosed()) rs.close()
if (null != rs && ! rs.isClosed()) {
rs.close()
}
} catch {
case e: Exception => logWarning("Exception closing resultset", e)
}
try {
if (null != stmt && ! stmt.isClosed()) stmt.close()
if (null != stmt && ! stmt.isClosed()) {
stmt.close()
}
} catch {
case e: Exception => logWarning("Exception closing statement", e)
}
try {
if (null != conn && ! stmt.isClosed()) conn.close()
if (null != conn && ! conn.isClosed()) {
conn.close()
}
logInfo("closed connection")
} catch {
case e: Exception => logWarning("Exception closing connection", e)
Expand All @@ -120,3 +126,4 @@ object JdbcRDD {
Array.tabulate[Object](rs.getMetaData.getColumnCount)(i => rs.getObject(i + 1))
}
}