Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/mcs/class
diff options
context:
space:
mode:
authorJb Evain <jbevain@gmail.com>2010-06-22 16:22:08 +0400
committerJb Evain <jbevain@gmail.com>2010-06-22 16:22:08 +0400
commit2f2bd4ce47627de08de6d2cba20b43dbb48a7a68 (patch)
treefd4d7c09208e6c962340524f55f644c9689b6ab1 /mcs/class
parent455a746c96aa4da2e87e0e925f81e31dbd45030c (diff)
fixicate
svn path=/branches/mono-2-6/mcs/; revision=159332
Diffstat (limited to 'mcs/class')
-rw-r--r--mcs/class/System.Core/System.Linq/QueryableEnumerable.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/mcs/class/System.Core/System.Linq/QueryableEnumerable.cs b/mcs/class/System.Core/System.Linq/QueryableEnumerable.cs
index a22f6e31e33..0a3da70710b 100644
--- a/mcs/class/System.Core/System.Linq/QueryableEnumerable.cs
+++ b/mcs/class/System.Core/System.Linq/QueryableEnumerable.cs
@@ -123,11 +123,14 @@ namespace System.Linq {
if (enumerable != null)
return enumerable.ToString ();
+ if (expression == null)
+ return base.ToString ();
+
var constant = expression as ConstantExpression;
- if (constant != null)
- return constant.ToString ();
+ if (constant != null && constant.Value == this)
+ return base.ToString ();
- return base.ToString ();
+ return expression.ToString ();
}
}
}