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 my...@apache.org on 2011/08/23 02:51:07 UTC
svn commit: r1160516 - in /db/derby/code/branches/10.8: ./
java/client/org/apache/derby/client/net/
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/
Author: myrnavl
Date: Tue Aug 23 00:51:07 2011
New Revision: 1160516
URL: http://svn.apache.org/viewvc?rev=1160516&view=rev
Log:
DERBY-5287; tasks for 10.8.2 release
backporting fix for DERBY-5158 (revision 1089795) to 10.8.
Added:
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby5158Test.java
- copied unchanged from r1089795, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby5158Test.java
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetConnectionReply.java
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 23 00:51:07 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,1095247,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,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,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612
+/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,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,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612
Modified: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetConnectionReply.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetConnectionReply.java?rev=1160516&r1=1160515&r2=1160516&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetConnectionReply.java (original)
+++ db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetConnectionReply.java Tue Aug 23 00:51:07 2011
@@ -189,18 +189,15 @@ public class NetConnectionReply extends
private void parseRDBCMMreply(ConnectionCallbackInterface connection) throws DisconnectException {
int peekCP = parseTypdefsOrMgrlvlovrs();
- if (peekCP != CodePoint.ENDUOWRM && peekCP != CodePoint.SQLCARD) {
- parseCommitError(connection);
- return;
- }
+ parseENDUOWRM(connection);
+ peekCP = parseTypdefsOrMgrlvlovrs();
- if (peekCP == CodePoint.ENDUOWRM) {
- parseENDUOWRM(connection);
- peekCP = parseTypdefsOrMgrlvlovrs();
+ if (peekCP == CodePoint.SQLCARD) {
+ NetSqlca netSqlca = parseSQLCARD(null);
+ connection.completeSqlca(netSqlca);
+ } else {
+ parseCommitError(connection);
}
-
- NetSqlca netSqlca = parseSQLCARD(null);
- connection.completeSqlca(netSqlca);
}
// Parse the reply for the RDB Rollback Unit of Work Command.
@@ -208,16 +205,16 @@ public class NetConnectionReply extends
// for the rdbrllbck command.
private void parseRDBRLLBCKreply(ConnectionCallbackInterface connection) throws DisconnectException {
int peekCP = parseTypdefsOrMgrlvlovrs();
- if (peekCP != CodePoint.ENDUOWRM) {
- parseRollbackError();
- return;
- }
parseENDUOWRM(connection);
peekCP = parseTypdefsOrMgrlvlovrs();
- NetSqlca netSqlca = parseSQLCARD(null);
- connection.completeSqlca(netSqlca);
+ if (peekCP == CodePoint.SQLCARD) {
+ NetSqlca netSqlca = parseSQLCARD(null);
+ connection.completeSqlca(netSqlca);
+ } else {
+ parseRollbackError();
+ }
}
// Parse the reply for the Exchange Server Attributes Command.
@@ -878,11 +875,16 @@ public class NetConnectionReply extends
netAgent_.setSvrcod(svrcod);
NetSqlca netSqlca = parseSQLCARD(null);
- netAgent_.netConnection_.completeSqlca(netSqlca);
- agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
- new ClientMessageId(SQLState.DRDA_CONNECTION_TERMINATED),
- msgutil_.getTextMessage(MessageId.CONN_DRDA_CMDCHKRM),
- new Exception(netSqlca.getSqlErrmc())));
+ netAgent_.netConnection_.completeSqlca(netSqlca);
+
+ agent_.accumulateChainBreakingReadExceptionAndThrow(
+ new DisconnectException(
+ agent_,
+ new ClientMessageId(SQLState.DRDA_CONNECTION_TERMINATED),
+ msgutil_.getTextMessage(
+ MessageId.CONN_DRDA_CMDCHKRM),
+ new SqlException(agent_.logWriter_,
+ netSqlca)));
}
Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java?rev=1160516&r1=1160515&r2=1160516&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java Tue Aug 23 00:51:07 2011
@@ -49,6 +49,7 @@ public class _Suite extends BaseTestCase
suite.addTest(ConcurrencyTest.suite());
suite.addTest(DaylightSavingTest.suite());
suite.addTest(HoldabilityTest.suite());
+ suite.addTest(Derby5158Test.suite());
suite.addTest(LobLengthTest.suite());
suite.addTest(ProcedureTest.suite());
suite.addTest(SURQueryMixTest.suite());