Merge pull request #251 from JimmyLoveSiren/master

keep stacktrace when throws an exception
neuecc · Jul 16, 2018 · eb99514 · eb99514
2 parents 5eba32d + f0df3e5
commit eb99514
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 12 deletions.
diff --git a/Assets/Plugins/UniRx/Scripts/InternalUtil/ExceptionExtensions.cs b/Assets/Plugins/UniRx/Scripts/InternalUtil/ExceptionExtensions.cs
@@ -0,0 +1,15 @@
+namespace UniRx.InternalUtil
+{
+	using System;
+
+	static class ExceptionExtensions
+	{
+		public static void Throw(this Exception exception)
+		{
+#if NET_4_6
+			System.Runtime.ExceptionServices.ExceptionDispatchInfo.Capture(exception).Throw();
+#endif
+			throw exception;
+		}
+	}
+}
diff --git a/Assets/Plugins/UniRx/Scripts/InternalUtil/ExceptionExtensions.cs.meta b/Assets/Plugins/UniRx/Scripts/InternalUtil/ExceptionExtensions.cs.meta
diff --git a/Assets/Plugins/UniRx/Scripts/InternalUtil/ListObserver.cs b/Assets/Plugins/UniRx/Scripts/InternalUtil/ListObserver.cs
@@ -99,7 +99,7 @@ public void OnCompleted()
 
         public void OnError(Exception error)
         {
-            throw error;
+            error.Throw();
         }
 
         public void OnNext(T value)

diff --git a/Assets/Plugins/UniRx/Scripts/Notification.cs b/Assets/Plugins/UniRx/Scripts/Notification.cs
@@ -9,6 +9,7 @@
 using System.Globalization;
 using System.Collections.Generic;
 using System;
+using UniRx.InternalUtil;
 
 #pragma warning disable 0659
 #pragma warning disable 0661
@@ -270,7 +271,7 @@ public OnErrorNotification(Exception exception)
             /// <summary>
             /// Throws the exception.
             /// </summary>
-            public override T Value { get { throw exception; } }
+            public override T Value { get { exception.Throw(); throw exception; } }
 
             /// <summary>
             /// Returns the exception.

diff --git a/Assets/Plugins/UniRx/Scripts/Observer.cs b/Assets/Plugins/UniRx/Scripts/Observer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading;
+using UniRx.InternalUtil;
 
 namespace UniRx
 {
@@ -492,7 +493,7 @@ public static IDisposable SubscribeWithState3<T, TState1, TState2, TState3>(this
     internal static class Stubs
     {
         public static readonly Action Nop = () => { };
-        public static readonly Action<Exception> Throw = ex => { throw ex; };
+        public static readonly Action<Exception> Throw = ex => { ex.Throw(); };
 
         // marker for CatchIgnore and Catch avoid iOS AOT problem.
         public static IObservable<TSource> CatchIgnore<TSource>(Exception ex)
@@ -505,19 +506,19 @@ internal static class Stubs<T>
     {
         public static readonly Action<T> Ignore = (T t) => { };
         public static readonly Func<T, T> Identity = (T t) => t;
-        public static readonly Action<Exception, T> Throw = (ex, _) => { throw ex; };
+        public static readonly Action<Exception, T> Throw = (ex, _) => { ex.Throw(); };
     }
 
     internal static class Stubs<T1, T2>
     {
         public static readonly Action<T1, T2> Ignore = (x, y) => { };
-        public static readonly Action<Exception, T1, T2> Throw = (ex, _, __) => { throw ex; };
+        public static readonly Action<Exception, T1, T2> Throw = (ex, _, __) => { ex.Throw(); };
     }
 
 
     internal static class Stubs<T1, T2, T3>
     {
         public static readonly Action<T1, T2, T3> Ignore = (x, y, z) => { };
-        public static readonly Action<Exception, T1, T2, T3> Throw = (ex, _, __, ___) => { throw ex; };
+        public static readonly Action<Exception, T1, T2, T3> Throw = (ex, _, __, ___) => { ex.Throw(); };
     }
 }
diff --git a/Assets/Plugins/UniRx/Scripts/Operators/Wait.cs b/Assets/Plugins/UniRx/Scripts/Operators/Wait.cs
@@ -1,4 +1,5 @@
 using System;
+using UniRx.InternalUtil;
 
 namespace UniRx.Operators
 {
@@ -36,7 +37,7 @@ public T Run()
                 }
             }
 
-            if (ex != null) throw ex;
+            if (ex != null) ex.Throw();
             if (!seenValue) throw new InvalidOperationException("No Elements.");
 
             return value;

diff --git a/Assets/Plugins/UniRx/Scripts/Subjects/AsyncSubject.cs b/Assets/Plugins/UniRx/Scripts/Subjects/AsyncSubject.cs
@@ -29,7 +29,7 @@ public T Value
             {
                 ThrowIfDisposed();
                 if (!isStopped) throw new InvalidOperationException("AsyncSubject is not completed yet");
-                if (lastError != null) throw lastError;
+                if (lastError != null) lastError.Throw();
                 return lastValue;
             }
         }
@@ -315,7 +315,7 @@ public T GetResult()
 
             if (lastError != null)
             {
-                throw lastError;
+                lastError.Throw();
             }
 
             if (!hasValue)

diff --git a/Assets/Plugins/UniRx/Scripts/Subjects/BehaviorSubject.cs b/Assets/Plugins/UniRx/Scripts/Subjects/BehaviorSubject.cs
@@ -23,7 +23,7 @@ public T Value
             get
             {
                 ThrowIfDisposed();
-                if (lastError != null) throw lastError;
+                if (lastError != null) lastError.Throw();
                 return lastValue;
             }
         }

diff --git a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/Observable.Unity.cs b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/Observable.Unity.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using UniRx.InternalUtil;
 using UniRx.Triggers;
 using UnityEngine;
 using System.Threading;
@@ -151,7 +152,7 @@ bool IEnumerator.MoveNext()
             {
                 if (reThrowOnError && HasError)
                 {
-                    throw Error;
+                    Error.Throw();
                 }
 
                 return false;
@@ -1143,7 +1144,7 @@ static IEnumerable<IObservable<T>> RepeatInfinite<T>(IObservable<T> source)
         internal static class Stubs
         {
             public static readonly Action Nop = () => { };
-            public static readonly Action<Exception> Throw = ex => { throw ex; };
+            public static readonly Action<Exception> Throw = ex => { ex.Throw(); };
 
             // Stubs<T>.Ignore can't avoid iOS AOT problem.
             public static void Ignore<T>(T t)

diff --git a/Dlls/UniRx.Library/UniRx.Library.csproj b/Dlls/UniRx.Library/UniRx.Library.csproj
@@ -93,6 +93,9 @@
     <Compile Include="..\..\Assets\Plugins\UniRx\Scripts\InternalUtil\AscynLock.cs">
       <Link>InternalUtil\AscynLock.cs</Link>
     </Compile>
+    <Compile Include="..\..\Assets\Plugins\UniRx\Scripts\InternalUtil\ExceptionExtensions.cs">
+      <Link>ExceptionExtensions.cs</Link>
+    </Compile>
     <Compile Include="..\..\Assets\Plugins\UniRx\Scripts\InternalUtil\ImmutableList.cs">
       <Link>InternalUtil\ImmutableList.cs</Link>
     </Compile>

diff --git a/Dlls/UniRx/UniRx.csproj b/Dlls/UniRx/UniRx.csproj
@@ -259,6 +259,9 @@
     <Compile Include="..\..\Assets\Plugins\UniRx\Scripts\InternalUtil\AscynLock.cs">
       <Link>InternalUtil\AscynLock.cs</Link>
     </Compile>
+    <Compile Include="..\..\Assets\Plugins\UniRx\Scripts\InternalUtil\ExceptionExtensions.cs">
+      <Link>ExceptionExtensions.cs</Link>
+    </Compile>
     <Compile Include="..\..\Assets\Plugins\UniRx\Scripts\InternalUtil\ImmutableList.cs">
       <Link>InternalUtil\ImmutableList.cs</Link>
     </Compile>