diff options
| author | Audrius Meskauskas <audriusa@Bioinformatics.org> | 2006-03-24 17:40:24 +0000 |
|---|---|---|
| committer | Audrius Meskauskas <audriusa@Bioinformatics.org> | 2006-03-24 17:40:24 +0000 |
| commit | 63f5926a4f85a4c5f4c8349a7d5bc985badd503f (patch) | |
| tree | e459cef953f7bdc2a4d995b04143b2bcac9ff478 /gnu/java/rmi/server/CombinedClassLoader.java | |
| parent | f370efa1358a912b3c57e4bce650babbebd59269 (diff) | |
| download | classpath-63f5926a4f85a4c5f4c8349a7d5bc985badd503f.tar.gz | |
2006-03-24 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/java/rmi/activation/ActivationSystemTransient.java:
Inherit from Activator.
2006-03-24 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/java/rmi/activation/DefaultActivationGroup.java (newInstance):
Print debug message if debug flag is set.
* gnu/java/rmi/activation/DefaultActivationSystem.java: Rewritten.
* gnu/java/rmi/server/ActivatableServerRef.java (activate): assign
detail, do not call iniCause(). (exportClass): New method.
* gnu/java/rmi/server/CombinedClassLoader.java (constructor):
Ignore null (bootstrap) class loader.
* gnu/java/rmi/server/UnicastServerRef.java (methods, skel, stub,
buildMethodHash, findStubSkelClass, getHelperClass): Changed
visibility to protected.
* java/rmi/activation/Activatable.java (export, register): Rewritten.
(toStub): New method.
* java/rmi/activation/ActivationGroup.java (getSystem): Rewritten.
* java/rmi/activation/ActivationSystem.java (SYSTEM_PORT):
Explained property java.rmi.activation.port.
Applying two patches toghether because the intermediate version does not build.
Diffstat (limited to 'gnu/java/rmi/server/CombinedClassLoader.java')
| -rw-r--r-- | gnu/java/rmi/server/CombinedClassLoader.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/java/rmi/server/CombinedClassLoader.java b/gnu/java/rmi/server/CombinedClassLoader.java index efffda4c6..6225fb30b 100644 --- a/gnu/java/rmi/server/CombinedClassLoader.java +++ b/gnu/java/rmi/server/CombinedClassLoader.java @@ -77,7 +77,7 @@ public class CombinedClassLoader extends ClassLoader while (iter.hasNext()) { cl = iter.next(); - if (!sLoaders.contains(cl)) + if (cl!=null && !sLoaders.contains(cl)) sLoaders.add(cl); } |