From d80ac2fd2df4e7fb8a28acfa512bb11472b5cc99 Mon Sep 17 00:00:00 2001
From: liugz18 <57401541+liugz18@users.noreply.github.com>
Date: 星期四, 18 七月 2024 21:34:55 +0800
Subject: [PATCH] Rename 'res' in line 514 to avoid with naming conflict with line 365
---
runtime/csharp/AliParaformerAsr/AliParaformerAsr/Utils/YamlHelper.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/runtime/csharp/AliParaformerAsr/AliParaformerAsr/Utils/YamlHelper.cs b/runtime/csharp/AliParaformerAsr/AliParaformerAsr/Utils/YamlHelper.cs
index 15c13e3..225d4c8 100644
--- a/runtime/csharp/AliParaformerAsr/AliParaformerAsr/Utils/YamlHelper.cs
+++ b/runtime/csharp/AliParaformerAsr/AliParaformerAsr/Utils/YamlHelper.cs
@@ -14,16 +14,19 @@
/// YamlHelper
/// Copyright (c) 2023 by manyeyes
/// </summary>
- internal class YamlHelper
+ internal class YamlHelper
{
- public static T ReadYaml<T>(string yamlFilePath)
+ public static T ReadYaml<T>(string yamlFilePath) where T:new()
{
if (!File.Exists(yamlFilePath))
{
-#pragma warning disable CS8603 // 鍙兘杩斿洖 null 寮曠敤銆�
- return default(T);
-#pragma warning restore CS8603 // 鍙兘杩斿洖 null 寮曠敤銆�
+ // 濡傛灉鍏佽杩斿洖榛樿瀵硅薄锛屽垯鏂板缓涓�涓粯璁ゅ璞★紝鍚﹀垯搴旇鏄姏鍑哄紓甯�
+ // If allowing to return a default object, create a new default object; otherwise, throw an exception
+
+ return new T();
+ // throw new Exception($"not find yaml config file: {yamlFilePath}");
}
+
StreamReader yamlReader = File.OpenText(yamlFilePath);
Deserializer yamlDeserializer = new Deserializer();
T info = yamlDeserializer.Deserialize<T>(yamlReader);
--
Gitblit v1.9.1