2010-06-17 Miguel de Icaza <miguel@novell.com>

	* DataConverter.cs: On bracketed cases, save the position as well,
	like we do in the repeat case without brackets.  Fixes #595929

svn path=/trunk/mcs/; revision=159075

diff --git a/mcs/class/corlib/Mono/ChangeLog b/mcs/class/corlib/Mono/ChangeLog
index bae12d1f9f070d4f944f7ce58c97cea29a68bb0f..f218ac2222779db074845dd96a7afd0c866c3e05 100644 (file)
--- a/mcs/class/corlib/Mono/ChangeLog
+++ b/mcs/class/corlib/Mono/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-17  Miguel de Icaza  <miguel@novell.com>
+
+       * DataConverter.cs: On bracketed cases, save the position as well,
+       like we do in the repeat case without brackets.  Fixes #595929
+
 2010-03-07  Rodrigo Kumpera  <rkumpera@novell.com>
 
        * Runtime.cs: Document how NewObject() is meant to be used.

diff --git a/mcs/class/corlib/Mono/DataConverter.cs b/mcs/class/corlib/Mono/DataConverter.cs
index d0bf0476f602cb04b521e2f24848f65a4a62eedf..a60337aebe5d3111042f4b90e3433eec0f20698c 100644 (file)
--- a/mcs/class/corlib/Mono/DataConverter.cs
+++ b/mcs/class/corlib/Mono/DataConverter.cs
@@ -643,6 +643,7 @@ namespace Mono {
                                        if (count == -1)
                                                throw new ArgumentException ("invalid size specification");
                                        i = j;
+                                       save = i + 1;
                                        repeat = count;
                                        break;