[SPARK-12048][SQL] Prevent to close JDBC resources twice

gcc · srowen · commit c8747a9db718 · 2015-12-06T16:27:51.000Z
Author: gcc <spark-src@condor.rhaag.ip> Closes #10101 from rh99/master. (cherry picked from commit 04b6799) Signed-off-by: Sean Owen <sowen@cloudera.com>
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/jdbc/JDBCRDD.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/jdbc/JDBCRDD.scala
@@ -509,6 +509,7 @@ private[sql] class JDBCRDD(
       } catch {
         case e: Exception => logWarning("Exception closing connection", e)
       }
+      closed = true
     }
 
     override def hasNext: Boolean = {

Original file line number	Diff line number	Diff line change
`@@ -509,6 +509,7 @@ private[sql] class JDBCRDD(`
`509`	`509`	`} catch {`
`510`	`510`	`case e: Exception => logWarning("Exception closing connection", e)`
`511`	`511`	`}`
	`512`	`+ closed = true`
`512`	`513`	`}`
`513`	`514`
`514`	`515`	`override def hasNext: Boolean = {`