changeset 158:99b3301fc27c

Merge
author valeriep
date Mon, 31 Mar 2008 16:50:16 -0700
parents c063b7fb55f7 e1bf7407c933
children df5d7e6ac15e
files
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c	Mon Mar 31 16:16:12 2008 -0700
+++ b/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c	Mon Mar 31 16:50:16 2008 -0700
@@ -123,7 +123,10 @@
         C_GetFunctionList = (CK_C_GetFunctionList) dlsym(hModule, getFunctionListStr);
         (*env)->ReleaseStringUTFChars(env, jGetFunctionList, getFunctionListStr);
     }
-    if ((C_GetFunctionList == NULL) || ((systemErrorMessage = dlerror()) != NULL)){
+    if (C_GetFunctionList == NULL) {
+        throwIOException(env, "ERROR: C_GetFunctionList == NULL");
+        return;
+    } else if ( (systemErrorMessage = dlerror()) != NULL ){
         throwIOException(env, systemErrorMessage);
         return;
     }