You are viewing a plain text version of this content. The canonical link for it is here.

Posted to derby-commits@db.apache.org by ka...@apache.org on 2011/06/07 11:48:15 UTC

svn commit: r1132928 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java

Author: kahatlen
Date: Tue Jun  7 09:48:15 2011
New Revision: 1132928

URL: http://svn.apache.org/viewvc?rev=1132928&view=rev
Log:
DERBY-5263: xmlTestTriggerWithXMLOperators fails with java.lang.NoSuchMethodError

Skip the post soft upgrade phase if the old version suffers from DERBY-4835.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java?rev=1132928&r1=1132927&r2=1132928&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java Tue Jun  7 09:48:15 2011
@@ -1262,6 +1262,12 @@ public class BasicSetup extends UpgradeC
             return;
         }
 
+        if (getPhase() == PH_POST_SOFT_UPGRADE && oldSuffersFromDerby4835()) {
+            // DERBY-5263: Executing the trigger will fail after soft upgrade
+            // in all the versions that suffer from DERBY-4835. Skip the test.
+            return;
+        }
+
         Statement s = createStatement();
 
         if (getPhase() == PH_CREATE) {