2004-02-05 Atsushi Enomoto <atsushi@ximian.com>

	* DefaultContext.cs : trivial processing order fix.

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

diff --git a/mcs/class/System.XML/System.Xml.XPath/ChangeLog b/mcs/class/System.XML/System.Xml.XPath/ChangeLog
index fd1d6b3151ec6111721ec1815b66f58cc55091d7..c1b99eeb4aada823db9841640d78c700f7fcff55 100644 (file)
--- a/mcs/class/System.XML/System.Xml.XPath/ChangeLog
+++ b/mcs/class/System.XML/System.Xml.XPath/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-05  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * DefaultContext.cs : trivial processing order fix.
+
 2004-01-27  Atsushi Enomoto  <atsushi@ximian.com>
 
        * DefaultContext.cs : Avoid exception if possible.

diff --git a/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs b/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs
index 4e3480cb1181d3f2024f2d3a43ead4ddd7729c78..05c9d262e5d3326faccc6811e9485704152ee6d2 100644 (file)
--- a/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs
+++ b/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs
@@ -62,6 +62,8 @@ namespace System.Xml.XPath
                {
                        if (arg == null)
                                throw new ArgumentNullException ();
+                       if (arg is BaseIterator)
+                               arg = ToString (arg);   // follow on
                        if (arg is string)
                        {
                                string s = arg as string;
@@ -76,8 +78,6 @@ namespace System.Xml.XPath
                                        return double.NaN;
                                }
                        }
-                       if (arg is BaseIterator)
-                               arg = ToString (arg);   // follow on
                        if (arg is double)
                                return (double) arg;
                        if (arg is bool)