rpms/jss/F-11 jss-loadlibrary.patch,1.1,1.2 jss.spec,1.10,1.11

[rcritten]

Author: rcritten

Update of /cvs/extras/rpms/jss/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15123

Modified Files:
	jss-loadlibrary.patch jss.spec 
Log Message:
Need to explicitly catch UnsatisfiedLinkError exception for System.load()


jss-loadlibrary.patch:
 CryptoManager.java |   19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

Index: jss-loadlibrary.patch
===================================================================
RCS file: /cvs/extras/rpms/jss/F-11/jss-loadlibrary.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jss-loadlibrary.patch	7 Jan 2010 16:56:03 -0000	1.1
+++ jss-loadlibrary.patch	13 Jan 2010 21:08:13 -0000	1.2
@@ -15,12 +15,12 @@ diff -uN --recursive jss-4.2.6.orig/mozi
 +                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");
 +                }
 +            }


Index: jss.spec
===================================================================
RCS file: /cvs/extras/rpms/jss/F-11/jss.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- jss.spec	7 Jan 2010 16:56:26 -0000	1.10
+++ jss.spec	13 Jan 2010 21:08:13 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           jss
 Version:        4.2.6
-Release:        3%{?dist}
+Release:        4%{?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 at redhat.com> 4.2.6-4
+- Need to explicitly catch UnsatisfiedLinkError exception for System.load()
+
 * Thu Jan  7 2010 Rob Crittenden <rcritten at redhat.com> 4.2.6-3
 - Move location of libjss4.so to subdirectory and use System.load() to
   load it instead of System.loadLibrary() for Fedora packaging compliance