Author: myrnavl
Date: Thu Oct  6 17:56:42 2011
New Revision: 1179724

URL: http://svn.apache.org/viewvc?rev=1179724&view=rev
Log:
DERBY-5409; GrantRevokeDDLTest fails under Java 7
  backported revision 1170470 from trunk.

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct  6 17:56:42 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1166313,1167017,1167226,1167470,1169692,1171227,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589,1179374
+/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1166313,1167017,1167226,1167470,1169692,1170470,1171227,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589,1179374

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java?rev=1179724&r1=1179723&r2=1179724&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java Thu Oct  6 17:56:42 2011
@@ -10370,14 +10370,9 @@ public final class GrantRevokeDDLTest ex
     //  recompile of trigger action, we will not loose the privilege
     //  requirements for the triggers
     public void testAlterTablePrivilegesIntace() throws Exception {
-        Statement st = createStatement();
-        ResultSet rs = null;
-        
         Connection user1Connection = openUserConnection("user1");
         Statement st_user1Connection = user1Connection.createStatement();
         
-        st = createStatement();
-        
         st_user1Connection.executeUpdate(
         		"create table user1.t11 (c111 int, c112 int, c113 int)");
         st_user1Connection.executeUpdate(
@@ -10486,6 +10481,9 @@ public final class GrantRevokeDDLTest ex
         		"drop table user1.t12");
         st_user1Connection.executeUpdate(
         		"drop table user1.t13");
+
+        st_user1Connection.executeUpdate("drop schema user1 restrict");
+        st_user2Connection.executeUpdate("drop schema user2 restrict");
     }
 
     // DERBY-5044 During alter table drop column, we recompile all the 
@@ -10496,14 +10494,9 @@ public final class GrantRevokeDDLTest ex
     //  and able to detect trigger dependencies even if they are created
     //  by a different user
     public void testAlterTableWithPrivileges() throws Exception {
-        Statement st = createStatement();
-        ResultSet rs = null;
-        
         Connection user1Connection = openUserConnection("user1");
         Statement st_user1Connection = user1Connection.createStatement();
         
-        st = createStatement();
-        
         st_user1Connection.executeUpdate(
         		"create table user1.t11 (c111 int, c112 int)");
         st_user1Connection.executeUpdate(
@@ -10560,6 +10553,9 @@ public final class GrantRevokeDDLTest ex
                 "drop table user1.t11");
         st_user1Connection.executeUpdate(
                 "drop table user1.t12");
+
+        st_user1Connection.executeUpdate("drop schema user1 restrict");
+        st_user2Connection.executeUpdate("drop schema user2 restrict");
     }