diff options
| author | Mark Spruiell <mes@zeroc.com> | 2009-08-19 12:08:09 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2009-08-19 12:08:09 -0700 |
| commit | 1f4b0b171c403a358fe65ae316ab4d579dfccace (patch) | |
| tree | e328b66c38eef819fbe701a4613463b14b333f0e /java | |
| parent | Bug 4212 - add use of ice_invoke_async to demo (diff) | |
| download | ice-1f4b0b171c403a358fe65ae316ab4d579dfccace.tar.bz2 ice-1f4b0b171c403a358fe65ae316ab4d579dfccace.tar.xz ice-1f4b0b171c403a358fe65ae316ab4d579dfccace.zip | |
fixing NPE in Java class-loading code
Diffstat (limited to 'java')
| -rw-r--r-- | java/demo/Ice/applet/applet.pro | 1 | ||||
| -rw-r--r-- | java/src/IceInternal/Util.java | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/java/demo/Ice/applet/applet.pro b/java/demo/Ice/applet/applet.pro index dae1ea08906..bc6a51450ec 100644 --- a/java/demo/Ice/applet/applet.pro +++ b/java/demo/Ice/applet/applet.pro @@ -23,6 +23,7 @@ # enable obfuscation but it would make things like stack traces # much harder to read. -dontobfuscate +-dontoptimize -keepclassmembers class * implements java.io.Serializable { static final long serialVersionUID; diff --git a/java/src/IceInternal/Util.java b/java/src/IceInternal/Util.java index 12b0792b06d..15c8ed0d181 100644 --- a/java/src/IceInternal/Util.java +++ b/java/src/IceInternal/Util.java @@ -78,7 +78,11 @@ public final class Util { try { - c = findClass(className, ClassLoader.getSystemClassLoader()); + ClassLoader cl = ClassLoader.getSystemClassLoader(); + if(cl != null) + { + c = findClass(className, cl); + } } catch(SecurityException ex) { |