diff options
| author | Thomas Kunze <thommycheck@gmx.de> | 2008-09-04 10:17:18 +0000 |
|---|---|---|
| committer | Thomas Kunze <thommycheck@gmx.de> | 2008-09-04 10:17:18 +0000 |
| commit | ae63a4dad7b06af132c6ba5bdb5fb98b2231525a (patch) | |
| tree | 62d8fae898721cffb503baa6c43ba795427045b9 /packages/classpath/files/cp-byte-loophelper.patch | |
| parent | 309c832c2c21ceb97fd589ebce8327d0d2bba731 (diff) | |
| parent | 3c20604cd26ca8da11ac9afb669629c20355c4e4 (diff) | |
merge of '0d3b0d788fccfc1c07e0da07e8f8596c062e2ef2'
and '8a4df13bdb5d6b154edb85a4b71e38ac457670a0'
Diffstat (limited to 'packages/classpath/files/cp-byte-loophelper.patch')
| -rw-r--r-- | packages/classpath/files/cp-byte-loophelper.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/packages/classpath/files/cp-byte-loophelper.patch b/packages/classpath/files/cp-byte-loophelper.patch new file mode 100644 index 0000000000..4fac362cba --- /dev/null +++ b/packages/classpath/files/cp-byte-loophelper.patch @@ -0,0 +1,68 @@ +Index: gnu/java/nio/charset/ByteDecodeLoopHelper.java +=================================================================== +RCS file: /sources/classpath/classpath/gnu/java/nio/charset/ByteDecodeLoopHelper.java,v +retrieving revision 1.1 +diff -u -r1.1 ByteDecodeLoopHelper.java +--- gnu/java/nio/charset/ByteDecodeLoopHelper.java 23 Nov 2007 16:11:17 -0000 1.1 ++++ gnu/java/nio/charset/ByteDecodeLoopHelper.java 3 Sep 2008 23:11:29 -0000 +@@ -119,6 +119,8 @@ + int inRemaining = in.remaining(); + int outRemaining = out.remaining(); + CoderResult result; ++ ++ bailOut: + if (inRemaining <= outRemaining) + { + for (int i = 0; i < inRemaining; i++) +@@ -129,7 +131,7 @@ + { + inPos--; + result = CoderResult.unmappableForLength(1); +- break; ++ break bailOut; + } + char c = mapToChar(b); + outArray[outPos] = c; +@@ -147,7 +149,7 @@ + { + inPos--; + result = CoderResult.unmappableForLength(1); +- break; ++ break bailOut; + } + char c = mapToChar(b); + outArray[outPos] = c; +Index: gnu/java/nio/charset/ByteEncodeLoopHelper.java +=================================================================== +RCS file: /sources/classpath/classpath/gnu/java/nio/charset/ByteEncodeLoopHelper.java,v +retrieving revision 1.1 +diff -u -r1.1 ByteEncodeLoopHelper.java +--- gnu/java/nio/charset/ByteEncodeLoopHelper.java 23 Nov 2007 16:11:17 -0000 1.1 ++++ gnu/java/nio/charset/ByteEncodeLoopHelper.java 3 Sep 2008 23:11:29 -0000 +@@ -120,6 +120,8 @@ + int inRemaining = in.remaining(); + int outRemaining = out.remaining(); + CoderResult result; ++ ++ bailOut: + if (inRemaining <= outRemaining) + { + for (int i = 0; i < inRemaining; i++) +@@ -130,7 +132,7 @@ + { + inPos--; + result = CoderResult.unmappableForLength(1); +- break; ++ break bailOut; + } + byte b = mapToByte(inChar); + outArray[outPos] = b; +@@ -148,7 +150,7 @@ + { + inPos--; + result = CoderResult.unmappableForLength(1); +- break; ++ break bailOut; + } + byte b = mapToByte(inChar); + outArray[outPos] = b; |