diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-28 13:29:13 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-28 13:29:13 +0000 |
| commit | 1020ce5944edde4364baef4d371cd4f9b0dae721 (patch) | |
| tree | 602cd7aa7c947386134690d8e0f6b53abcdeacb9 /libjava/classpath/javax/rmi/ssl | |
| parent | 9f41ce98ce6f4f7c8ac5e2c4b6e5d27e10201015 (diff) | |
| download | ppe42-gcc-1020ce5944edde4364baef4d371cd4f9b0dae721.tar.gz ppe42-gcc-1020ce5944edde4364baef4d371cd4f9b0dae721.zip | |
libjava/
2008-06-28 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (classpath-0_97_2-release).
* Regenerate class and header files.
* Regenerate auto* files.
* gcj/javaprims.h: Define jobjectRefType.
* jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
(_Jv_JNIFunctions): Initialize GetObjectRefType.
* gnu/classpath/jdwp/VMVirtualMachine.java,
java/security/VMSecureRandom.java: Merge from classpath.
* HACKING: Fix typo.
* ChangeLog-2007: New file.
* configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.
libjava/classpath/
2008-06-28 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Disable check for JAVAC, when
not configured with --enable-java-maintainer-mode.
* aclocal.m4, configure: Regenerate.
* native/jni/gstreamer-peer/Makefile.am: Do not link with
libclasspathnative.
* native/jni/gstreamer-peer/Makefile.in: Regenerate.
* tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
JCOMPILER, drop flags not understood by gcj.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137223 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/javax/rmi/ssl')
| -rw-r--r-- | libjava/classpath/javax/rmi/ssl/SslRMIClientSocketFactory.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libjava/classpath/javax/rmi/ssl/SslRMIClientSocketFactory.java b/libjava/classpath/javax/rmi/ssl/SslRMIClientSocketFactory.java index 1fed5824cd4..3a4c6cebeff 100644 --- a/libjava/classpath/javax/rmi/ssl/SslRMIClientSocketFactory.java +++ b/libjava/classpath/javax/rmi/ssl/SslRMIClientSocketFactory.java @@ -50,7 +50,7 @@ import java.rmi.server.RMIClientSocketFactory; * SslRMIClientSocketFactory * * This class implements an RMIClientSocketFactory for SSL sockets. - * it uses the defeult SSLClientSocketFactory. + * it uses the default SSLClientSocketFactory. * * This class can optionally use the following system properties, if set: * <code>javax.rmi.ssl.client.enabledCipherSuites</code> @@ -92,17 +92,19 @@ public class SslRMIClientSocketFactory private String[] getProp(String p) { - StringTokenizer st; + String o; try { - String o = (String)System.getProperty( p ); - st = new StringTokenizer( o, "," ); + o = System.getProperty(p); } catch(SecurityException se) { return null; } + if (o == null) + return null; + StringTokenizer st = new StringTokenizer( o, "," ); int n = st.countTokens(); if( n < 1 ) return null; |
