# HG changeset patch
# User valeriep
# Date 1207007416 25200
# Node ID bae6558c1edd387b6fce68d69730638423af6038
# Parent  bec12c857972c03e6e18eda173e42499c9bf0b01# Parent  3711f2ad2f6dfd428257144579c147ba24df454f
Merge

diff -r bec12c857972 -r bae6558c1edd jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c
--- a/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c	Mon Mar 31 16:16:12 2008 -0700
+++ b/jdk/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;
     }