jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1209581 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/DataSourceWrapper.java
Date Fri, 02 Dec 2011 16:58:36 GMT
Author: jukka
Date: Fri Dec  2 16:58:35 2011
New Revision: 1209581

URL: http://svn.apache.org/viewvc?rev=1209581&view=rev
Log:
JCR-3167: Make Jackrabbit compile on Java 7

Add a dummy implementation of the DataSource.getParentLogger() method.

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/DataSourceWrapper.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/DataSourceWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/DataSourceWrapper.java?rev=1209581&r1=1209580&r2=1209581&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/DataSourceWrapper.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/DataSourceWrapper.java
Fri Dec  2 16:58:35 2011
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.core.util.
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.logging.Logger;
 
 import javax.sql.DataSource;
 
@@ -65,6 +66,15 @@ public class DataSourceWrapper implement
     }
 
     /**
+     * Unsupported Java 7 method.
+     *
+     * @see <a href="https://issues.apache.org/jira/browse/JCR-3167">JCR-3167</a>
+     */
+    public Logger getParentLogger() {
+        throw new UnsupportedOperationException("Java 7 method not supported");
+    }
+
+    /**
      * {@inheritDoc}
      */
     public Connection getConnection() throws SQLException {
@@ -105,4 +115,5 @@ public class DataSourceWrapper implement
     public void setLoginTimeout(int seconds) throws SQLException {
         dataSource.setLoginTimeout(seconds);
     }
+
 }



Mime
View raw message