QPID-2245 QMF protocol changes will make 0.6 incompatible with 0.5

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@889619 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 5 insertions, 33 deletions

diff --git a/dotnet/client-010/management/console/Broker.cs b/dotnet/client-010/management/console/Broker.cs
index 2d2bedf110..7684da9e12 100644
--- a/dotnet/client-010/management/console/Broker.cs
+++ b/dotnet/client-010/management/console/Broker.cs
@@ -165,7 +165,7 @@ namespace org.apache.qpid.console
 		public IEncoder SetHeader(IEncoder enc, char opcode, long sequence) {
 			enc.WriteUint8((short)'A') ;
 			enc.WriteUint8((short)'M') ;
-			enc.WriteUint8((short)'3') ;
+			enc.WriteUint8((short)'2') ;
 	        enc.WriteUint8((short)opcode) ;
 			enc.WriteUint32(sequence) ;
 			return enc ;
@@ -219,7 +219,7 @@ namespace org.apache.qpid.console
 					return returnValue ;
 				}
 				character = (char) decoder.ReadUint8() ;			
-				if (character != '3') {
+				if (character != '2') {
 					return returnValue ;
 				}	
 				returnValue = true ;
diff --git a/dotnet/client-010/management/console/SchemaClass.cs b/dotnet/client-010/management/console/SchemaClass.cs
index 653221034d..320312b61d 100644
--- a/dotnet/client-010/management/console/SchemaClass.cs
+++ b/dotnet/client-010/management/console/SchemaClass.cs
@@ -60,7 +60,7 @@ namespace org.apache.qpid.console
 		    Kind = kind ;
 		    Session = session ;
 		    this.Key = key ;   
-		    bool hasSupertype = !(dec.ReadUint8().Equals(0)) ;	
+		    bool hasSupertype = false ;
 		 
 		 	if (kind == CLASS_KIND_TABLE) {
 				int propCount = dec.ReadUint16() ;
diff --git a/dotnet/client-010/management/console/Session.cs b/dotnet/client-010/management/console/Session.cs
index cdc30e482b..d9c5948e57 100644
--- a/dotnet/client-010/management/console/Session.cs
+++ b/dotnet/client-010/management/console/Session.cs
@@ -616,21 +616,7 @@ namespace org.apache.qpid.console
 		 		case 12: return dec.ReadFloat() ;       // float		
 		 		case 13: return dec.ReadDouble() ;      // double		 
 		 		case 14: return dec.ReadUuid() ;	    // UUID			
-		 		case 15:	                            // Ftable
-		 			Dictionary<string, object> ftable = new Dictionary<string, object>() ;
-		 			MSDecoder sc = new MSDecoder() ;
-		 			sc.Init(new MemoryStream(dec.ReadVbin32())) ;
-		 			if (sc.HasRemaining()) {
-		 				long count = sc.ReadUint32() ;
-		 				while (count > 0) {
-		 					string key = sc.ReadStr8() ;
-		 					short code = sc.ReadUint8() ;
-		 					object newValue = this.DecodeValue(sc, code) ;
-		 					ftable.Add(key, newValue) ;
-		 					count -= 1 ;
-		 				}
-		 			}
-		 			return ftable ;
+		 		case 15: return dec.ReadMap() ;             // Ftable
 		 		case 16: return dec.ReadInt8() ;        // int8
 		 		case 17: return dec.ReadInt16() ;       // int16    
 		 		case 18: return dec.ReadInt32() ;       // int32
@@ -709,21 +695,7 @@ namespace org.apache.qpid.console
 			 		case 12: enc.WriteFloat((float) val); break;	   // FLOAT
 			 		case 13: enc.WriteDouble((double) val);   break;   // DOUBLE			 			
 			 		case 14: enc.WriteUuid((UUID) val) ; break ;	   // UUID		
-			 		case 15:	                                       // Ftable
-			 			Dictionary<string, object> ftable = (Dictionary<string, object>) val ;
-			 			MSEncoder sc = new MSEncoder(1) ;
-			 			sc.Init() ;
-			 			sc.WriteUint32(ftable.Count) ;
-			 			foreach (String key in ftable.Keys) {
-			 				object obj = ftable[key] ;
-			 				short innerType = Util.QMFType(obj) ;
-			 				sc.WriteStr8(key) ;
-			 				sc.WriteUint8(innerType) ;
-			 				this.EncodeValue(sc,innerType,obj) ;
-			 			}
-			 			byte[] bytes = sc.Segment().ToArray() ;
-			 			enc.WriteVbin32(bytes) ;
-			 			break ;
+			 		case 15: enc.WriteMap((Dictionary<string, object>) val) ; break ;  // Ftable
 			 		case 16: enc.WriteInt8((short) val) ; break;       // int8
 			 		case 17: enc.WriteInt16((int) val) ;  break;       // int16     
 			 		case 18: enc.WriteInt32(long.Parse(""+ val)) ; break;       // int32