svn commit: r1734255 - in /jackrabbit/oak/branches/1.4: ./ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java

[reschke]

Author: reschke
Date: Wed Mar  9 15:01:42 2016
New Revision: 1734255

URL: http://svn.apache.org/viewvc?rev=1734255&view=rev
Log:
OAK-4113: RDBJDBCTools: fix JDBC driver version check (ported to 1.4)

Modified:
    jackrabbit/oak/branches/1.4/   (props changed)
    
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java

Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar  9 15:01:42 2016
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733875
+/jackrabbit/oak/trunk:1733875,1734254
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java?rev=1734255&r1=1734254&r2=1734255&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
 (original)
+++ 
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
 Wed Mar  9 15:01:42 2016
@@ -242,12 +242,12 @@ public class RDBJDBCTools {
             int maj = md.getDriverMajorVersion();
             int min = md.getDriverMinorVersion();
 
-            if (maj < drmax || (maj == dbmax && min < dbmin)) {
+            if (maj < drmax || (maj == drmax && min < drmin)) {
                 if (result.length() != 0) {
                     result.append(", ");
                 }
                 result.append("Unsupported " + dbname + " driver version: " + 
md.getDriverName() + " " + maj + "." + min
-                        + ", expected at least " + dbmax + "." + dbmin);
+                        + ", expected at least " + drmax + "." + drmin);
             }
         }