fix exception test

more sophisticated fetching opt value
dxFeed · Apr 18, 2024 · 826b75d · 826b75d
1 parent ff48333
commit 826b75d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/DXFeedFramework/Native/Graal/Isolate.swift b/DXFeedFramework/Native/Graal/Isolate.swift
@@ -100,6 +100,7 @@ class Isolate {
 
     func throwException() throws {
         let thread = currentThread()
-        _ = try ErrorCheck.nativeCall(thread, dxfg_throw_exception(thread))        
+        _ = try ErrorCheck.nativeCall(thread, dxfg_get_and_clear_thread_exception_t(thread)) // to init com.dxfeed.sdk.NativeUtils
+        _ = try ErrorCheck.nativeCall(thread, dxfg_throw_exception(thread))
     }
 }
diff --git a/DXFeedFramework/Utils/Optional+Ext.swift b/DXFeedFramework/Utils/Optional+Ext.swift
@@ -9,9 +9,11 @@ import Foundation
 
 extension Optional {
     func value() throws -> Wrapped {
-        guard let value = self else {
+        switch self {
+        case .none:
             throw GraalException.nullException
+        case .some(let val):
+            return val
         }
-        return value
     }
 }