diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-02-16 17:55:17 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-02-16 17:55:17 +0000 |
| commit | b6cea42fe0b70101bc71225ff942b79d237af4cb (patch) | |
| tree | 4b15f582c345973698003215209ec0510ecb2c8d /java | |
| parent | Fixed a bug in RouterInfo which could cause a NullPointerException when (diff) | |
| download | ice-b6cea42fe0b70101bc71225ff942b79d237af4cb.tar.bz2 ice-b6cea42fe0b70101bc71225ff942b79d237af4cb.tar.xz ice-b6cea42fe0b70101bc71225ff942b79d237af4cb.zip | |
Fix
Diffstat (limited to 'java')
| -rw-r--r-- | java/demo/Glacier2/callback/README | 8 | ||||
| -rw-r--r-- | java/src/IceInternal/IndirectReference.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/java/demo/Glacier2/callback/README b/java/demo/Glacier2/callback/README index 0ab29d25a02..cf717fab10e 100644 --- a/java/demo/Glacier2/callback/README +++ b/java/demo/Glacier2/callback/README @@ -5,16 +5,16 @@ To run the demo: Start the server: -$ ./server +$ java Server In a separate window, start the session server: -$ ./sessionserver +$ java SessionServer In a separate window, start the Glacier2 router: -$ ../../../bin/glacier2router --Ice.Config=config.glacier2 +$ glacier2router --Ice.Config=config.glacier2 In a separate window, start the client: -$ ./client +$ java Client diff --git a/java/src/IceInternal/IndirectReference.java b/java/src/IceInternal/IndirectReference.java index 600958f027d..8c8132d6ae6 100644 --- a/java/src/IceInternal/IndirectReference.java +++ b/java/src/IceInternal/IndirectReference.java @@ -251,7 +251,7 @@ public class IndirectReference extends RoutableReference { return false; } - return _locatorInfo == null ? rsh._locatorInfo == null : _locatorInfo.equals(rhs._locatorInfo); + return _locatorInfo == null ? rhs._locatorInfo == null : _locatorInfo.equals(rhs._locatorInfo); } private String _adapterId; |