diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-01-15 18:46:12 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-01-15 18:46:12 +0100 |
| commit | f561241d76b7a3d58a8652a8ae6642361f6d596b (patch) | |
| tree | 06602625807c74e6476043eee42f304e15609592 /java/src/IceInternal/Outgoing.java | |
| parent | Fixed(ICE-5184) -IceGridGUI will not allow me to enter port in connection cre... (diff) | |
| download | ice-f561241d76b7a3d58a8652a8ae6642361f6d596b.tar.bz2 ice-f561241d76b7a3d58a8652a8ae6642361f6d596b.tar.xz ice-f561241d76b7a3d58a8652a8ae6642361f6d596b.zip | |
Fixed ICE-5131 - parsing of -p <version> for proxies, tweaked UDP endpoint deprecation warning for -v/-e
Diffstat (limited to 'java/src/IceInternal/Outgoing.java')
| -rw-r--r-- | java/src/IceInternal/Outgoing.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java index b176fed16df..903cf328384 100644 --- a/java/src/IceInternal/Outgoing.java +++ b/java/src/IceInternal/Outgoing.java @@ -23,10 +23,10 @@ public final class Outgoing implements OutgoingMessageCallback _sent = false; _handler = handler; _observer = observer; - _encoding = Protocol.checkForCompatibleEncoding(handler.getReference().getEncoding()); + _encoding = Protocol.getCompatibleEncoding(handler.getReference().getEncoding()); _os = new BasicStream(_handler.getReference().getInstance(), Protocol.currentProtocolEncoding); - Protocol.checkSupportedProtocol(_handler.getReference().getProtocol()); + Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(_handler.getReference().getProtocol())); writeHeader(operation, mode, context); } @@ -44,9 +44,9 @@ public final class Outgoing implements OutgoingMessageCallback _sent = false; _handler = handler; _observer = observer; - _encoding = Protocol.checkForCompatibleEncoding(handler.getReference().getEncoding()); + _encoding = Protocol.getCompatibleEncoding(handler.getReference().getEncoding()); - Protocol.checkSupportedProtocol(_handler.getReference().getProtocol()); + Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(_handler.getReference().getProtocol())); writeHeader(operation, mode, context); } |