From 878c526930a6ffc3c3c21d6155b48acc364baf18 Mon Sep 17 00:00:00 2001
From: Jim Norman <jnorman@novell.com>
Date: Mon, 7 Nov 2005 18:48:48 +0000
Subject: [PATCH] Fix launch GUI error for IsSecretPersistent

---
 c_sharp/NSSCSWrapper/NativeCalls.cs | 40 +++++++++++++++--------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/c_sharp/NSSCSWrapper/NativeCalls.cs b/c_sharp/NSSCSWrapper/NativeCalls.cs
index 3a977eba..ee5b61bb 100644
--- a/c_sharp/NSSCSWrapper/NativeCalls.cs
+++ b/c_sharp/NSSCSWrapper/NativeCalls.cs
@@ -1244,31 +1244,33 @@ namespace Novell.CASA
 		public static bool IsSecretPersistent(uint ssFlags, string id)
 		{
 			int rcode = 0;
-			if (null != id && "" !=id)
+						
+			SSCS_SECRET_ID_T secretID = new SSCS_SECRET_ID_T();
+			try 
 			{
-				SSCS_SECRET_ID_T secretID = new SSCS_SECRET_ID_T();
-				try 
+				if(ssFlags == 0)
 				{
-					if(ssFlags == 0)
-					{
-						secretID.len = id.Length;
-						secretID.id = id;
-						rcode = miCASAIsSecretPersistent(ssFlags,
-							secretID,
-							new SSCS_EXT_T());
-					}
-					else
-					{
-						rcode = miCASAIsSecretPersistent(ssFlags,
-							null,
-							new SSCS_EXT_T());
-					}
+					if ((null == id) || ("" == id))
+			            return false;
+
+					secretID.len = id.Length;
+					secretID.id = id;
+					rcode = miCASAIsSecretPersistent(ssFlags,
+						secretID,
+						new SSCS_EXT_T());
 				}
-				catch (Exception e)
+				else
 				{
-					Console.WriteLine(e.ToString());
+					rcode = miCASAIsSecretPersistent(ssFlags,
+						null,
+						new SSCS_EXT_T());
 				}
 			}
+			catch (Exception e)
+			{
+				Console.WriteLine(e.ToString());
+			}
+			
 			
 			if(rcode == 1)
 				return true;