diff options
| author | Robert Schuster <theBohemian@gmx.net> | 2008-09-04 00:06:09 +0000 |
|---|---|---|
| committer | Robert Schuster <theBohemian@gmx.net> | 2008-09-04 00:06:09 +0000 |
| commit | ca05f572c92f614d2cd5fe65775a4d7e23d83de2 (patch) | |
| tree | 369e796f9a18663e5882f9cc2254c2b9148b868a | |
| parent | 27347dd877974878cedbe6b027235fe2783c5b07 (diff) | |
| download | classpath-ca05f572c92f614d2cd5fe65775a4d7e23d83de2.tar.gz | |
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* gnu/java/nio/charset/ByteDecodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
* gnu/java/nio/charset/ByteEncodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gnu/java/nio/charset/ByteDecodeLoopHelper.java | 6 | ||||
| -rw-r--r-- | gnu/java/nio/charset/ByteEncodeLoopHelper.java | 6 |
3 files changed, 15 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2008-09-04 Robert Schuster <robertschuster@fsfe.org> + * gnu/java/nio/charset/ByteDecodeLoopHelper: + (arrayDecodeLoop): Added new break label, escape to that label. + * gnu/java/nio/charset/ByteEncodeLoopHelper: + (arrayDecodeLoop): Added new break label, escape to that label. + +2008-09-04 Robert Schuster <robertschuster@fsfe.org> + * java/text/DecimalFormat.java: (scanFix): Use 'i + 1' when looking at following character. (scanNegativePattern): Dito. diff --git a/gnu/java/nio/charset/ByteDecodeLoopHelper.java b/gnu/java/nio/charset/ByteDecodeLoopHelper.java index 33dfa0263..a1eb5e206 100644 --- a/gnu/java/nio/charset/ByteDecodeLoopHelper.java +++ b/gnu/java/nio/charset/ByteDecodeLoopHelper.java @@ -119,6 +119,8 @@ public abstract class ByteDecodeLoopHelper 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 @@ public abstract class ByteDecodeLoopHelper { inPos--; result = CoderResult.unmappableForLength(1); - break; + break bailOut; } char c = mapToChar(b); outArray[outPos] = c; @@ -147,7 +149,7 @@ public abstract class ByteDecodeLoopHelper { inPos--; result = CoderResult.unmappableForLength(1); - break; + break bailOut; } char c = mapToChar(b); outArray[outPos] = c; diff --git a/gnu/java/nio/charset/ByteEncodeLoopHelper.java b/gnu/java/nio/charset/ByteEncodeLoopHelper.java index 5f703b195..b1a4f10da 100644 --- a/gnu/java/nio/charset/ByteEncodeLoopHelper.java +++ b/gnu/java/nio/charset/ByteEncodeLoopHelper.java @@ -120,6 +120,8 @@ public abstract class ByteEncodeLoopHelper 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 @@ public abstract class ByteEncodeLoopHelper { inPos--; result = CoderResult.unmappableForLength(1); - break; + break bailOut; } byte b = mapToByte(inChar); outArray[outPos] = b; @@ -148,7 +150,7 @@ public abstract class ByteEncodeLoopHelper { inPos--; result = CoderResult.unmappableForLength(1); - break; + break bailOut; } byte b = mapToByte(inChar); outArray[outPos] = b; |