2009-06-09 Gonzalo Paniagua Javier <gonzalo@novell.com>

* XPathExpression.cs: Backport to Mono 2.4 the bug fix for multithreaded applications that use XPath. This was the fix for #477049 which also fixes #505678 svn path=/branches/mono-2-4-2/mcs/; revision=135816
elijahtaylor · Jun 10, 2009 · a76a480 · a76a480
1 parent a4f5795
commit a76a480
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/mcs/class/System.XML/System.Xml.XPath/ChangeLog b/mcs/class/System.XML/System.Xml.XPath/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-09 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+	* XPathExpression.cs: Backport to Mono 2.4 the bug fix
+	for multithreaded applications that use XPath.
+
+	This was the fix for #477049 which also fixes #505678
+
 2009-01-20  Atsushi Enomoto <atsushi@ximian.com>
 
 	* Expression.cs : give up sortless iterator optimization.

diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathExpression.cs b/mcs/class/System.XML/System.Xml.XPath/XPathExpression.cs
@@ -95,12 +95,8 @@ static XPathExpression Compile (string xpath)
 		internal static XPathExpression Compile (string xpath,
 			NSResolver nsmgr, IStaticXsltContext ctx)
 		{
-			XPathExpression x = ExpressionCache.Get (xpath, ctx);
-			if (x == null) {
-				XPathParser parser = new XPathParser (ctx);
-				x = new CompiledExpression (xpath, parser.Compile (xpath));
-				ExpressionCache.Set (xpath, ctx, x);
-			}
+			XPathParser parser = new XPathParser (ctx);
+			CompiledExpression x = new CompiledExpression (xpath, parser.Compile (xpath));
 			x.SetContext (nsmgr);
 			return x;
 		}