#i21596# Digital Signatures...

1 files changed, 16 insertions, 21 deletions

diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index ea86f20cd156..17014f4b1b1d 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: seinitializer_nssimpl.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: mmi $ $Date: 2004-07-23 04:53:50 $
+ *  last change: $Author: mt $ $Date: 2004-07-23 08:34:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -229,35 +229,30 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
     PK11SlotInfo*       pSlot = NULL ;
 
     rtl::OString sCertDir;
-    if( sCertDB.getLength() > 0 )
+    if( sCertDB.getLength() )
     {
         sCertDir = rtl::OString(sCertDB, sCertDB.getLength(), RTL_TEXTENCODING_ASCII_US);
     }
     else
     {
-        rtl::OUString ouCertDir;
-        if (!getMozillaCurrentProfile(ouCertDir))
+        static rtl::OString* pDefaultCertDir = NULL;
+        if ( !pDefaultCertDir )
         {
-            return NULL;
+            pDefaultCertDir = new rtl::OString;
+            rtl::OUString ouCertDir;
+            if ( getMozillaCurrentProfile(ouCertDir) )
+            {
+                *pDefaultCertDir = rtl::OString(ouCertDir, ouCertDir.getLength(), RTL_TEXTENCODING_ASCII_US);
+                DBG_ERROR( pDefaultCertDir->getStr() );
+            }
         }
+        sCertDir = *pDefaultCertDir;
 
-        sCertDir = rtl::OString(ouCertDir, ouCertDir.getLength(), RTL_TEXTENCODING_ASCII_US);
+    }
 
-        DBG_ASSERT(0, sCertDir.getStr());
-        /*
-        char *pCurrentProfilePath = getCurrentProfilePath();
+    if( !sCertDir.getLength() )
+        return NULL;
 
-        if (pCurrentProfilePath == NULL)
-        {
-            return NULL;
-        }
-        else
-        {
-            sCertDir = rtl::OString(pCurrentProfilePath);
-            free(pCurrentProfilePath);
-        }
-        */
-    }
 
     /* Initialize NSPR and NSS */
     PR_Init( PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1 ) ;