Fixed ICE-5126 - Improved client side encoding checks

1 files changed, 25 insertions, 0 deletions

diff --git a/java/src/IceInternal/Protocol.java b/java/src/IceInternal/Protocol.java
index af30ba0ee02..e1e88ce3511 100644
--- a/java/src/IceInternal/Protocol.java
+++ b/java/src/IceInternal/Protocol.java
@@ -130,6 +130,31 @@ final public class Protocol
         }
     }
 
+    //
+    // Either return the given encoding if not compatible, or the greatest
+    // supported encoding otherwise.
+    //
+    static public Ice.EncodingVersion
+    checkForCompatibleEncoding(Ice.EncodingVersion v)
+    {
+        if(v.major != currentEncoding.major)
+        {
+            return v; // Unsupported encoding, return as is.
+        }
+        else if(v.minor < currentEncoding.minor)
+        {
+            return v; // Supported encoding.
+        }
+        else
+        {
+            //
+            // Unsupported but compatible, use the currently supported
+            // encoding, that's the best we can do.
+            //
+            return currentEncoding; 
+        }
+    }
+
     static public boolean
     isSupported(Ice.ProtocolVersion version, Ice.ProtocolVersion supported)
     {