Repository: spark
Updated Branches:
  refs/heads/master 5c1fabafa -> 41c6a44b1


[SPARK-7312][SQL] SPARK-6913 broke jdk6 build

JIRA: https://issues.apache.org/jira/browse/SPARK-7312

Author: Yin Huai <yh...@databricks.com>

Closes #5847 from yhuai/jdbcJava6 and squashes the following commits:

68433a2 [Yin Huai] compile with Java 6


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/41c6a44b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/41c6a44b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/41c6a44b

Branch: refs/heads/master
Commit: 41c6a44b1a6ae5c70a8e8dc82d0062de9bdee5b3
Parents: 5c1faba
Author: Yin Huai <yh...@databricks.com>
Authored: Fri May 1 16:47:00 2015 -0700
Committer: Michael Armbrust <mich...@databricks.com>
Committed: Fri May 1 16:47:00 2015 -0700

----------------------------------------------------------------------
 sql/core/src/main/scala/org/apache/spark/sql/jdbc/jdbc.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/41c6a44b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/jdbc.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/jdbc.scala 
b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/jdbc.scala
index ae9af1e..3a6c2c1 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/jdbc.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/jdbc.scala
@@ -17,7 +17,7 @@
 
 package org.apache.spark.sql
 
-import java.sql.{Connection, Driver, DriverManager, DriverPropertyInfo, 
PreparedStatement}
+import java.sql.{Connection, Driver, DriverManager, DriverPropertyInfo, 
PreparedStatement, SQLFeatureNotSupportedException}
 import java.util.Properties
 
 import scala.collection.mutable
@@ -195,7 +195,9 @@ package object jdbc {
 
     override def getMinorVersion: Int = wrapped.getMinorVersion
 
-    override def getParentLogger: java.util.logging.Logger = 
wrapped.getParentLogger
+    def getParentLogger: java.util.logging.Logger =
+      throw new SQLFeatureNotSupportedException(
+        s"${this.getClass().getName}.getParentLogger is not yet implemented.")
 
     override def connect(url: String, info: Properties): Connection = 
wrapped.connect(url, info)
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to