diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-11-16 15:52:28 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-16 15:52:28 +0100 |
| commit | 44bd0c07505a6841f4315eedcab0a228a6819852 (patch) | |
| tree | 7e5d08f5beb7941ea68f8659217efd2379e8acc4 /java/src/IceInternal/LocatorInfo.java | |
| parent | More changes to windows installers (diff) | |
| download | ice-44bd0c07505a6841f4315eedcab0a228a6819852.tar.bz2 ice-44bd0c07505a6841f4315eedcab0a228a6819852.tar.xz ice-44bd0c07505a6841f4315eedcab0a228a6819852.zip | |
Added support for proxy-options to IceGrid adapter, replica group and object descriptors
Diffstat (limited to 'java/src/IceInternal/LocatorInfo.java')
| -rw-r--r-- | java/src/IceInternal/LocatorInfo.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/IceInternal/LocatorInfo.java index 9639351b661..5355d3759ac 100644 --- a/java/src/IceInternal/LocatorInfo.java +++ b/java/src/IceInternal/LocatorInfo.java @@ -26,7 +26,15 @@ public final class LocatorInfo if(proxy != null) { Reference r = ((Ice.ObjectPrxHelperBase)proxy).__reference(); - if(!r.isIndirect()) + if(_ref.isWellKnown() && !Protocol.isSupported(_ref.getEncoding(), r.getEncoding())) + { + // + // If a well-known proxy and the returned proxy encoding isn't + // supported, we're done: there are no compatible endpoints + // we can use. + // + } + else if(!r.isIndirect()) { endpoints = r.getEndpoints(); } |