From 36b278d73225628b7bf719b665ee1f70b277e2ff Mon Sep 17 00:00:00 2001
From: Jihoon Jung <jh8801.jung@samsung.com>
Date: Thu, 5 Jan 2017 13:58:13 +0900
Subject: [PATCH] change for TC failed

Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
Change-Id: I3b124cd8fa847d19a7f755bd51b4caf3d6ab7076
---
 packaging/csapi-network-smartcard.spec                           | 2 +-
 .../Tizen.Network.Smartcard/SmartcardErrorFactory.cs             | 4 ++++
 .../Tizen.Network.Smartcard/SmartcardManager.cs                  | 9 ++++++++-
 .../Tizen.Network.Smartcard/SmartcardManagerImpl.cs              | 1 -
 .../Tizen.Network.Smartcard/SmartcardReader.cs                   | 3 +--
 .../Tizen.Network.Smartcard/SmartcardSession.cs                  | 6 ++----
 6 files changed, 16 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardManager.cs
 mode change 100644 => 100755 src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardManagerImpl.cs

diff --git a/packaging/csapi-network-smartcard.spec b/packaging/csapi-network-smartcard.spec
index 52a3946..9f8efcc 100644
--- a/packaging/csapi-network-smartcard.spec
+++ b/packaging/csapi-network-smartcard.spec
@@ -8,7 +8,7 @@
 
 Name:       csapi-network-smartcard
 Summary:    Tizen Smartcard API for C#
-Version:    1.0.2
+Version:    1.0.3
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
diff --git a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardErrorFactory.cs b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardErrorFactory.cs
index 70fafb9..a562a2f 100644
--- a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardErrorFactory.cs
+++ b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardErrorFactory.cs
@@ -60,6 +60,10 @@ namespace Tizen.Network.Smartcard
             {
                 throw new ArgumentException(err.ToString());
             }
+            else if (err == SmartcardError.NotSupportedError)
+            {
+                throw new NotSupportedException(err.ToString());
+            }
             else
             {
                 throw new InvalidOperationException(err.ToString());
diff --git a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardManager.cs b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardManager.cs
old mode 100644
new mode 100755
index b5d1903..1627cf8
--- a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardManager.cs
+++ b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardManager.cs
@@ -32,7 +32,14 @@ namespace Tizen.Network.Smartcard
         /// <returns>List of SmartcardReader objects.</returns>
         static public IEnumerable<SmartcardReader> GetReaders()
         {
-            return SmartcardManagerImpl.Instance.GetReaders();
+            try
+            {
+                return SmartcardManagerImpl.Instance.GetReaders();
+            }
+            catch (TypeInitializationException e)
+            {
+                throw e.InnerException;
+            }
         }
     }
 }
diff --git a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardManagerImpl.cs b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardManagerImpl.cs
old mode 100644
new mode 100755
index e7a0f9c..5e4db7f
--- a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardManagerImpl.cs
+++ b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardManagerImpl.cs
@@ -91,7 +91,6 @@ namespace Tizen.Network.Smartcard
             if (ret != (int)SmartcardError.None)
             {
                 Log.Error(Globals.LogTag, "Failed to deinitialize smartcard, Error - " + (SmartcardError)ret);
-                SmartcardErrorFactory.ThrowSmartcardException(ret);
             }
         }
 
diff --git a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardReader.cs b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardReader.cs
index 6ffde7d..bfa1266 100644
--- a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardReader.cs
+++ b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardReader.cs
@@ -141,8 +141,7 @@ namespace Tizen.Network.Smartcard
 
             foreach (SmartcardSession session in _sessionList)
             {
-                session.Dispose();
-                _sessionList.Remove(session);
+                session.Close();
             }
         }
     }
diff --git a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardSession.cs b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardSession.cs
index afd4179..bdadf29 100644
--- a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardSession.cs
+++ b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard/SmartcardSession.cs
@@ -174,14 +174,12 @@ namespace Tizen.Network.Smartcard
 
             foreach (SmartcardChannel channel in _basicChannelList)
             {
-                channel.Dispose();
-                _basicChannelList.Remove(channel);
+                channel.Close();
             }
 
             foreach (SmartcardChannel channel in _logicalChannelList)
             {
-                channel.Dispose();
-                _logicalChannelList.Remove(channel);
+                channel.Close();
             }
         }
 
-- 
2.7.4