classpath 0.97.2: Added cp-byte-loophelper.patch.

classpath-minimal 0.97.2: Dito.
classpath-native 0.97.2: Dito.

4 files changed, 77 insertions, 3 deletions

diff --git a/packages/classpath/classpath-minimal_0.97.2.bb b/packages/classpath/classpath-minimal_0.97.2.bb
index 5e6d53224e..44cffcec32 100644
--- a/packages/classpath/classpath-minimal_0.97.2.bb
+++ b/packages/classpath/classpath-minimal_0.97.2.bb
@@ -6,9 +6,11 @@ SRC_URI += "\
   file://javanet-local.patch;patch=1;pnum=0 \
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
+  file://decimalformat.patch;patch=1 \
+  file://cp-byte-loophelper.patch;patch=1;pnum=0 \
   "
 
-PR = "r1"
+PR = "r3"
 
 PROVIDES = "${PN} classpath"
 
diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb
index c9a239418b..cec256ecc2 100644
--- a/packages/classpath/classpath-native_0.97.2.bb
+++ b/packages/classpath/classpath-native_0.97.2.bb
@@ -1,6 +1,6 @@
 require classpath-native.inc
 
-PR = "r1"
+PR = "r2"
 
 # The code affected by the javanet-local patch
 # is usually not compiled. However if someone changes
@@ -12,5 +12,7 @@ SRC_URI += "\
   file://sun-security-getproperty_0.96.1.patch;patch=1;pnum=0 \
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
+  file://decimalformat.patch;patch=1 \
+  file://cp-byte-loophelper.patch;patch=1;pnum=0 \
   "
 
diff --git a/packages/classpath/classpath_0.97.2.bb b/packages/classpath/classpath_0.97.2.bb
index 1393e2c453..242bab95f2 100644
--- a/packages/classpath/classpath_0.97.2.bb
+++ b/packages/classpath/classpath_0.97.2.bb
@@ -6,9 +6,11 @@ SRC_URI += "\
   file://javanet-local.patch;patch=1;pnum=0 \
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
+  file://decimalformat.patch;patch=1 \
+  file://cp-byte-loophelper.patch;patch=1;pnum=0 \
   "
 
-PR = "r2"
+PR = "r4"
 
 DEPENDS += "gtk+ gconf libxtst"
 
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;