diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-02-16 17:47:43 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-02-16 17:47:43 +0000 |
| commit | 7b8dbbebc0363d607711e7b33b6b44a902ecddbd (patch) | |
| tree | 4b46127a7c732f2ab85a51733e1ea7c84f4d4ebc /java/src/IceInternal/LocatorInfo.java | |
| parent | rearranged components (diff) | |
| download | ice-7b8dbbebc0363d607711e7b33b6b44a902ecddbd.tar.bz2 ice-7b8dbbebc0363d607711e7b33b6b44a902ecddbd.tar.xz ice-7b8dbbebc0363d607711e7b33b6b44a902ecddbd.zip | |
Fixed a bug in RouterInfo which could cause a NullPointerException when
comparing references.
Added certificates for the C++ IceSSL plugin (needed by demos to start SSL
enabled services).
Added Glacier2 callback demo.
Diffstat (limited to 'java/src/IceInternal/LocatorInfo.java')
| -rw-r--r-- | java/src/IceInternal/LocatorInfo.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/IceInternal/LocatorInfo.java index 5ea9d6f2208..e333d386b26 100644 --- a/java/src/IceInternal/LocatorInfo.java +++ b/java/src/IceInternal/LocatorInfo.java @@ -27,6 +27,16 @@ public final class LocatorInfo public boolean equals(java.lang.Object obj) { + if(obj == null) + { + return false; + } + + if(obj == this) + { + return true; + } + LocatorInfo rhs = null; try { |