diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-11-05 22:03:30 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-11-05 22:03:30 +0000 |
| commit | 8b7fac3f033143cd6bf53d94be8c398982a3af21 (patch) | |
| tree | 29fe3b8d9e6a71fa49b9463d512a0919a748e78f /pki/base/osutil | |
| parent | 4add0f3ea82201194a78df5eb103b680e1c32521 (diff) | |
| download | pki-8b7fac3f033143cd6bf53d94be8c398982a3af21.tar.gz pki-8b7fac3f033143cd6bf53d94be8c398982a3af21.tar.xz pki-8b7fac3f033143cd6bf53d94be8c398982a3af21.zip | |
Bugzilla Bug #529919 - Wrap "System.load()" calls in JNI libraries within
try-catch block - removed Solaris condition
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@811 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/osutil')
6 files changed, 6 insertions, 12 deletions
diff --git a/pki/base/osutil/src/com/netscape/osutil/LibC.java b/pki/base/osutil/src/com/netscape/osutil/LibC.java index bf452b3fe..0cc18b9d6 100644 --- a/pki/base/osutil/src/com/netscape/osutil/LibC.java +++ b/pki/base/osutil/src/com/netscape/osutil/LibC.java @@ -46,8 +46,7 @@ public class LibC { boolean mNativeLibrariesLoaded = false; if (File.separatorChar == '/') { String os = System.getProperty( "os.name" ); - if( ( os.equals( "Linux" ) ) || - ( os.equals( "Solaris" ) ) ) { + if( ( os.equals( "Linux" ) ) ) { // Check for 64-bit library availability // prior to 32-bit library availability. mNativeLibrariesLoaded = diff --git a/pki/base/osutil/src/com/netscape/osutil/NTEventLogger.java b/pki/base/osutil/src/com/netscape/osutil/NTEventLogger.java index f7ec6441e..0f2bcfa41 100644 --- a/pki/base/osutil/src/com/netscape/osutil/NTEventLogger.java +++ b/pki/base/osutil/src/com/netscape/osutil/NTEventLogger.java @@ -42,8 +42,7 @@ public class NTEventLogger { static { boolean mNativeLibrariesLoaded = false; String os = System.getProperty( "os.name" ); - if( ( os.equals( "Linux" ) ) || - ( os.equals( "Solaris" ) ) ) { + if( ( os.equals( "Linux" ) ) ) { // Check for 64-bit library availability // prior to 32-bit library availability. mNativeLibrariesLoaded = diff --git a/pki/base/osutil/src/com/netscape/osutil/OSUtil.java b/pki/base/osutil/src/com/netscape/osutil/OSUtil.java index 0b1848ce0..905197435 100644 --- a/pki/base/osutil/src/com/netscape/osutil/OSUtil.java +++ b/pki/base/osutil/src/com/netscape/osutil/OSUtil.java @@ -48,8 +48,7 @@ public final class OSUtil { static { boolean mNativeLibrariesLoaded = false; String os = System.getProperty( "os.name" ); - if( ( os.equals( "Linux" ) ) || - ( os.equals( "Solaris" ) ) ) { + if( ( os.equals( "Linux" ) ) ) { // Check for 64-bit library availability // prior to 32-bit library availability. mNativeLibrariesLoaded = diff --git a/pki/base/osutil/src/com/netscape/osutil/ResourceLimit.java b/pki/base/osutil/src/com/netscape/osutil/ResourceLimit.java index 88f27cdd4..23a99836b 100644 --- a/pki/base/osutil/src/com/netscape/osutil/ResourceLimit.java +++ b/pki/base/osutil/src/com/netscape/osutil/ResourceLimit.java @@ -61,8 +61,7 @@ public class ResourceLimit { boolean mNativeLibrariesLoaded = false; if (File.separatorChar == '/') { String os = System.getProperty( "os.name" ); - if( ( os.equals( "Linux" ) ) || - ( os.equals( "Solaris" ) ) ) { + if( ( os.equals( "Linux" ) ) ) { // Check for 64-bit library availability // prior to 32-bit library availability. mNativeLibrariesLoaded = diff --git a/pki/base/osutil/src/com/netscape/osutil/Signal.java b/pki/base/osutil/src/com/netscape/osutil/Signal.java index 74d868f9b..724fb9986 100644 --- a/pki/base/osutil/src/com/netscape/osutil/Signal.java +++ b/pki/base/osutil/src/com/netscape/osutil/Signal.java @@ -192,8 +192,7 @@ public class Signal { boolean mNativeLibrariesLoaded = false; if (File.separatorChar == '/') { String os = System.getProperty( "os.name" ); - if( ( os.equals( "Linux" ) ) || - ( os.equals( "Solaris" ) ) ) { + if( ( os.equals( "Linux" ) ) ) { // Check for 64-bit library availability // prior to 32-bit library availability. mNativeLibrariesLoaded = diff --git a/pki/base/osutil/src/com/netscape/osutil/UserID.java b/pki/base/osutil/src/com/netscape/osutil/UserID.java index 15dca22cf..43b5a5da0 100644 --- a/pki/base/osutil/src/com/netscape/osutil/UserID.java +++ b/pki/base/osutil/src/com/netscape/osutil/UserID.java @@ -69,8 +69,7 @@ public class UserID { boolean mNativeLibrariesLoaded = false; if (File.separatorChar == '/') { String os = System.getProperty( "os.name" ); - if( ( os.equals( "Linux" ) ) || - ( os.equals( "Solaris" ) ) ) { + if( ( os.equals( "Linux" ) ) ) { // Check for 64-bit library availability // prior to 32-bit library availability. mNativeLibrariesLoaded = |