* java/text/DecimalFormat.java (parse): Always increment parsingclasspath-0_93-branch-point

       index and adjust pos result.

2 files changed, 10 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 43ef94e5d..9b8131483 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-01  Mark Wielaard  <mark@klomp.org>
+
+	* java/text/DecimalFormat.java (parse): Always increment parsing
+	index and adjust pos result.
+
 2006-12-01  Roman Kennke  <kennke@aicas.com>
 
 	* javax/swing/text/html/HTML.java
diff --git a/java/text/DecimalFormat.java b/java/text/DecimalFormat.java
index b82d9e01b..529e57133 100644
--- a/java/text/DecimalFormat.java
+++ b/java/text/DecimalFormat.java
@@ -660,11 +660,11 @@ public class DecimalFormat extends NumberFormat
     int len = str.length();
     if (len < stop) stop = len;
     
-    char ch;
-    int i = 0;
-    for (i = start; i < stop; i++)
+    int i = start;
+    while (i < stop)
       {
-        ch = str.charAt(i);
+        char ch = str.charAt(i);
+        i++;
        
         if (ch >= zero && ch <= (zero + 9))
           {
@@ -749,7 +749,7 @@ public class DecimalFormat extends NumberFormat
     
     if (isNegative) number.insert(0, '-');
    
-    pos.setIndex(i);
+    pos.setIndex(i - 1);
     
     // now we handle the return type
     BigDecimal bigDecimal = new BigDecimal(number.toString());