db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1148668 - in /db/derby/code/branches/10.8: ./ java/drda/org/apache/derby/impl/drda/DDMWriter.java
Date Wed, 20 Jul 2011 09:35:25 GMT
Author: kahatlen
Date: Wed Jul 20 09:35:25 2011
New Revision: 1148668

URL: http://svn.apache.org/viewvc?rev=1148668&view=rev
Log:
DERBY-5331: Incorrect use of CharsetEncoder in DDMWriter

Merged fix from trunk (revision 1148658).

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DDMWriter.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 20 09:35:25 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,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133304,1133317,1133741,1133752,1136363,1136371,1136397,1136844,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1141924,1142583,1142635,1146915,1146962
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133304,1133317,1133741,1133752,1136363,1136371,1136397,1136844,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1141924,1142583,1142635,1146915,1146962,1148658

Modified: db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DDMWriter.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DDMWriter.java?rev=1148668&r1=1148667&r2=1148668&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DDMWriter.java (original)
+++ db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DDMWriter.java Wed Jul
20 09:35:25 2011
@@ -1208,7 +1208,11 @@ class DDMWriter
 
 		// encode the string
 		CharBuffer input = CharBuffer.wrap(s);
+		encoder.reset();
 		CoderResult res = encoder.encode(input, buffer, true);
+		if (res == CoderResult.UNDERFLOW) {
+			res = encoder.flush(buffer);
+		}
 		if (SanityManager.DEBUG) {
 			// UNDERFLOW is returned if the entire string was encoded, OVERFLOW
 			// is returned if the string was truncated at LONGVARCHAR_MAX_LEN
@@ -1235,7 +1239,11 @@ class DDMWriter
 	{
 		ensureLength(maxEncodedLength(s));
 		CharBuffer input = CharBuffer.wrap(s);
+		encoder.reset();
 		CoderResult res = encoder.encode(input, buffer, true);
+		if (res == CoderResult.UNDERFLOW) {
+			res = encoder.flush(buffer);
+		}
 		if (SanityManager.DEBUG) {
 			SanityManager.ASSERT(res == CoderResult.UNDERFLOW,
 								 "CharBuffer was not exhausted: res = " + res);



Mime
View raw message