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:51:12 UTC
svn commit: r1132929 - in /db/derby/code/branches/10.8: ./
java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
Author: kahatlen
Date: Tue Jun 7 09:51:12 2011
New Revision: 1132929
URL: http://svn.apache.org/viewvc?rev=1132929&view=rev
Log:
DERBY-5263: xmlTestTriggerWithXMLOperators fails with java.lang.NoSuchMethodError
Merged fix from trunk (revision 1132928).
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 7 09:51:12 2011
@@ -1,2 +1,2 @@
/db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1101839,1102826,1103681,1103718,1125305,1126358,1127825,1127883,1129136,1129764,1129797,1130632,1130895,1131272,1132546,1132664,1132860
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1101839,1102826,1103681,1103718,1125305,1126358,1127825,1127883,1129136,1129764,1129797,1130632,1130895,1131272,1132546,1132664,1132860,1132928
Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java?rev=1132929&r1=1132928&r2=1132929&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java Tue Jun 7 09:51:12 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) {