Merge pull request #819 from brendanzagaeski/patch-1

[mono.git] / mcs / class / corlib / System / Nullable.cs

diff --git a/mcs/class/corlib/System/Nullable.cs b/mcs/class/corlib/System/Nullable.cs
index 5ebdbf4b23dc62df6848c5589815f0718dc5d349..11f6c67dbd4e4d73c69b0a3b4a007025069ea7bd 100644 (file)
--- a/mcs/class/corlib/System/Nullable.cs
+++ b/mcs/class/corlib/System/Nullable.cs
@@ -34,6 +34,7 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Diagnostics;
 
 namespace System
 {
@@ -73,14 +74,14 @@ namespace System
                {
                        if (nullableType == null)
                                throw new ArgumentNullException ("nullableType");
-                       if (nullableType.IsGenericType && nullableType.GetGenericTypeDefinition () == typeof (Nullable<>))
-                               return nullableType.GetGenericArguments ()[0];
-                       else
-                               return null;
+
+                       return nullableType.IsGenericType && !nullableType.IsGenericTypeDefinition && nullableType.GetGenericTypeDefinition () == typeof(Nullable<>) ?
+                               nullableType.GetGenericArguments () [0] : null;
                }
        }
 
        [Serializable]
+       [DebuggerStepThrough]
        public struct Nullable<T> where T: struct
        {
                #region Sync with runtime code
@@ -138,7 +139,7 @@ namespace System
 
                public T GetValueOrDefault ()
                {
-                       return has_value ? value : default (T);
+                       return value;
                }
 
                public T GetValueOrDefault (T defaultValue)