[asp.net] Fix for bug #650695. Implements the System.Web.{HttpNotFoundHandler,HttpNot...

[mono.git] / mcs / class / System.Web / System.Web.UI / XPathBinder.cs

diff --git a/mcs/class/System.Web/System.Web.UI/XPathBinder.cs b/mcs/class/System.Web/System.Web.UI/XPathBinder.cs
index 4503240aa8fa5a7236bf9a93f92fdce526065312..135edad6a4b7007d5292ee1bfd2eb6a648742776 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/XPathBinder.cs
+++ b/mcs/class/System.Web/System.Web.UI/XPathBinder.cs
@@ -28,30 +28,26 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 using System.Collections;
 using System.Collections.Specialized;
 using System.Text;
 using System.Xml.XPath;
 using System.Xml;
 
-namespace System.Web.UI {
-       public sealed class XPathBinder {
-               private XPathBinder ()
+namespace System.Web.UI 
+{
+       public sealed class XPathBinder 
+       {
+               XPathBinder ()
                {
                }
 
                public static object Eval (object container, string xpath)
                {
-                       return Eval (container, xpath, null);
+                       return Eval (container, xpath, (IXmlNamespaceResolver)null);
                }
 
-               public static string Eval (object container, string xpath, string format)
-               {
-                       return Eval (container, xpath, format, null);
-               }
-
-               public static string Eval (object container, string xpath, string format, IXmlNamespaceResolver resolver)
+               public static object Eval (object container, string xpath, IXmlNamespaceResolver resolver) 
                {
                        if (xpath == null || xpath.Length == 0)
                                throw new ArgumentNullException ("xpath");
@@ -71,6 +67,18 @@ namespace System.Web.UI {
                                        return null;
                        }
 
+                       return result;
+               }
+
+               public static string Eval (object container, string xpath, string format)
+               {
+                       return Eval (container, xpath, format, null);
+               }
+
+               public static string Eval (object container, string xpath, string format, IXmlNamespaceResolver resolver)
+               {
+                       object result = Eval (container, xpath, resolver);
+                       
                        if (result == null)
                                return String.Empty;
                        if (format == null || format.Length == 0)
@@ -108,5 +116,4 @@ namespace System.Web.UI {
                
        }
 }
-#endif