[rpms/jss] pqc: Need to explicitly catch UnsatisfiedLinkError exception for System.load()

[rpms/jss] pqc: Need to explicitly catch UnsatisfiedLinkError exception for System.load()

[rcritten]

A new commit has been pushed.

Repo   : rpms/jss
Branch : pqc
Commit : 5e878024aa2772f111f944fff519a6cce6f4cb8a
Author : rcritten <rcritten@fedoraproject.org>
Date   : 2010-01-13T21:21:04+00:00
Stats  : +6/-3 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/jss/c/5e878024aa2772f111f944fff519a6cce6f4cb8a?branch=pqc

Log:
Need to explicitly catch UnsatisfiedLinkError exception for System.load()

---
diff --git a/jss-loadlibrary.patch b/jss-loadlibrary.patch
index ac841b1..a8643a4 100644
--- a/jss-loadlibrary.patch
+++ b/jss-loadlibrary.patch
@@ -15,12 +15,12 @@ diff -uN --recursive jss-4.2.6.orig/mozilla/security/jss/org/mozilla/jss/CryptoM
 +                System.load( "/usr/lib64/jss/libjss4.so" );
 +                Debug.trace(Debug.VERBOSE, "jss library loaded");
 +                mNativeLibrariesLoaded = true;
-+            } catch( Exception e ) {
++            } catch( UnsatisfiedLinkError e ) {
 +                try {
 +                    System.load( "/usr/lib/jss/libjss4.so" );
 +                    Debug.trace(Debug.VERBOSE, "jss library loaded");
 +                    mNativeLibrariesLoaded = true;
-+                } catch( Exception f ) {
++                } catch( UnsatisfiedLinkError f ) {
 +                    Debug.trace(Debug.VERBOSE, "jss library load failed");
 +                }
 +            }

diff --git a/jss.spec b/jss.spec
index bd4664f..3c54bd0 100644
--- a/jss.spec
+++ b/jss.spec
@@ -1,6 +1,6 @@
 Name:           jss
 Version:        4.2.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Java Security Services (JSS)
 
 Group:          System Environment/Libraries
@@ -143,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 13 2010 Rob Crittenden <rcritten@redhat.com> 4.2.6-6
+- Need to explicitly catch UnsatisfiedLinkError exception for System.load()
+
 * Thu Jan  7 2010 Rob Crittenden <rcritten@redhat.com> 4.2.6-5
 - Move location of libjss4.so to subdirectory and use System.load() to
   load it instead of System.loadLibrary() for Fedora packaging compliance