You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2017/12/15 16:39:52 UTC
svn commit: r1818301 - in /jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb: RDBCacheConsistencyTest.java RDBConnectionWrapper.java RDBDataSourceWrapper.java

Author: reschke
Date: Fri Dec 15 16:39:52 2017
New Revision: 1818301

URL: http://svn.apache.org/viewvc?rev=1818301&view=rev
Log:
OAK-7069: RDBDataSourceWrapper: properly name setTemporaryUpdateException

Modified:
    jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistencyTest.java
    jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java
    jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java

Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistencyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistencyTest.java?rev=1818301&r1=1818300&r2=1818301&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistencyTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBCacheConsistencyTest.java Fri Dec 15 16:39:52 2017
@@ -70,7 +70,7 @@ public class RDBCacheConsistencyTest ext
     public void setTemporaryUpdateException(String msg) {
         DataSource ds = dsf.getRDBDataSource();
         if (ds instanceof RDBDataSourceWrapper) {
-            ((RDBDataSourceWrapper) ds).setTemporaryUpdateException(msg);
+            ((RDBDataSourceWrapper) ds).setTemporaryCommitException(msg);
         } else {
             fail();
         }

Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java?rev=1818301&r1=1818300&r2=1818301&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionWrapper.java Fri Dec 15 16:39:52 2017
@@ -86,8 +86,8 @@ public class RDBConnectionWrapper implem
         SQLException x = null;
         try {
             connection.commit();
-            if (this.datasource.getTemporaryUpdateException() != null && !isReadOnly) {
-                throw new SQLException(this.datasource.getTemporaryUpdateException());
+            if (this.datasource.getTemporaryCommitException() != null && !isReadOnly) {
+                throw new SQLException(this.datasource.getTemporaryCommitException());
             }
         } catch (SQLException ex) {
             x = ex;

Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java?rev=1818301&r1=1818300&r2=1818301&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceWrapper.java Fri Dec 15 16:39:52 2017
@@ -55,7 +55,7 @@ public class RDBDataSourceWrapper implem
     private final DataSource ds;
     private boolean batchResultPrecise = true;
     private boolean failAlterTableAddColumnStatements = false; 
-    private String temporaryUpdateException = null;
+    private String temporaryCommitException = null;
 
     // Logging
 
@@ -109,12 +109,12 @@ public class RDBDataSourceWrapper implem
         return this.failAlterTableAddColumnStatements;
     }
 
-    public void setTemporaryUpdateException(String exmsg) {
-        this.temporaryUpdateException = exmsg;
+    public void setTemporaryCommitException(String exmsg) {
+        this.temporaryCommitException = exmsg;
     }
 
-    public String getTemporaryUpdateException() {
-        return this.temporaryUpdateException;
+    public String getTemporaryCommitException() {
+        return this.temporaryCommitException;
     }
 
     // DataSource