Fixed ICE-6486: added tracing of encoding for replies, fixed Java bug where the reply for servant locator finished user exception was always encoded with 1.0

1 files changed, 15 insertions, 6 deletions

diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index aa733a554cb..c0c19e7a22b 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -303,7 +303,7 @@ printReply(ostream& s, BasicStream& stream)
             break;
         }
         }
-                
+
         string unknown;
         stream.read(unknown, false);
         s << "\nunknown = " << unknown;
@@ -316,6 +316,15 @@ printReply(ostream& s, BasicStream& stream)
         break;
     }
     }
+
+    if(replyStatus == replyOK || replyStatus == replyUserException)
+    {
+        Ice::EncodingVersion v = stream.skipEncaps();
+        if(v > Ice::Encoding_1_0)
+        {
+            s << "\nencoding = " << v;
+        }
+    }
 }
 
 static Byte
@@ -331,29 +340,29 @@ printMessage(ostream& s, BasicStream& stream)
         // We're done.
         break;
     }
-        
+
     case requestMsg:
     {
         printRequest(s, stream);
         break;
     }
-        
+
     case requestBatchMsg:
     {
         printBatchRequest(s, stream);
         break;
     }
-        
+
     case replyMsg:
     {
         printReply(s, stream);
         break;
     }
-        
+
     default:
     {
         break;
-    }    
+    }
     }
 
     return type;