activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r991699 - in /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp: Commands/ActiveMQDestination.cs Commands/ActiveMQMessage.cs Commands/ActiveMQStreamMessage.cs Transport/Tcp/TcpTransport.cs
Date Wed, 01 Sep 2010 20:50:08 GMT
Author: tabish
Date: Wed Sep  1 20:50:08 2010
New Revision: 991699

URL: http://svn.apache.org/viewvc?rev=991699&view=rev
Log:
code cleanup

Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQDestination.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQStreamMessage.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQDestination.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQDestination.cs?rev=991699&r1=991698&r2=991699&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQDestination.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQDestination.cs
Wed Sep  1 20:50:08 2010
@@ -301,21 +301,20 @@ namespace Apache.NMS.ActiveMQ.Commands
 			{
 				return null;
 			}
-			else if(type == ACTIVEMQ_TOPIC)
+			else switch(type)
 			{
-				result = new ActiveMQTopic(pyhsicalName);
-			}
-			else if(type == ACTIVEMQ_TEMPORARY_TOPIC)
-			{
-				result = new ActiveMQTempTopic(pyhsicalName);
-			}
-			else if(type == ACTIVEMQ_QUEUE)
-			{
-				result = new ActiveMQQueue(pyhsicalName);
-			}
-			else
-			{
-				result = new ActiveMQTempQueue(pyhsicalName);
+			    case ACTIVEMQ_TOPIC:
+			        result = new ActiveMQTopic(pyhsicalName);
+			        break;
+			    case ACTIVEMQ_TEMPORARY_TOPIC:
+			        result = new ActiveMQTempTopic(pyhsicalName);
+			        break;
+			    case ACTIVEMQ_QUEUE:
+			        result = new ActiveMQQueue(pyhsicalName);
+			        break;
+			    default:
+			        result = new ActiveMQTempQueue(pyhsicalName);
+			        break;
 			}
 			return result;
 		}

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs?rev=991699&r1=991698&r2=991699&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs
Wed Sep  1 20:50:08 2010
@@ -45,20 +45,13 @@ namespace Apache.NMS.ActiveMQ.Commands
 		}
 
         public override int GetHashCode()
-        {            
+        {
             MessageId id = this.MessageId;
 
-            if(id != null)
-            {
-                return id.GetHashCode();
-            }
-            else
-            {
-                return base.GetHashCode();
-            }
+            return id != null ? id.GetHashCode() : base.GetHashCode();
         }
 
-        public override byte GetDataStructureType()
+	    public override byte GetDataStructureType()
 		{
 			return ID_ACTIVEMQMESSAGE;
 		}
@@ -82,17 +75,15 @@ namespace Apache.NMS.ActiveMQ.Commands
         
 		public void Acknowledge()
 		{
-			if(null == Acknowledger)
+		    if(null == Acknowledger)
 			{
 				throw new NMSException("No Acknowledger has been associated with this message: " + this);
 			}
-			else
-			{
-				Acknowledger(this);
-			}
+		    
+            Acknowledger(this);
 		}
 
-		public virtual void ClearBody()
+	    public virtual void ClearBody()
 		{
 			this.ReadOnlyBody = false;
 			this.Content = null;
@@ -144,11 +135,11 @@ namespace Apache.NMS.ActiveMQ.Commands
 				if(null == properties)
 				{
 					properties = PrimitiveMap.Unmarshal(MarshalledProperties);
-					propertyHelper = new MessagePropertyIntercepter(this, properties, this.ReadOnlyProperties);
+					propertyHelper = new MessagePropertyIntercepter(this, properties, this.ReadOnlyProperties)
+					                     {AllowByteArrays = false};
 					
 					// Since JMS doesn't define a Byte array interface for properties we
 					// disable them here to prevent sending invalid data to the broker.
-					propertyHelper.AllowByteArrays = false;
 				}
 
 				return propertyHelper;
@@ -222,15 +213,10 @@ namespace Apache.NMS.ActiveMQ.Commands
 		{
 			get
 			{
-				if(null != MessageId)
-				{
-					return BaseDataStreamMarshaller.ToString(MessageId);
-				}
-
-				return String.Empty;
+			    return null != MessageId ? BaseDataStreamMarshaller.ToString(MessageId) : String.Empty;
 			}
 
-            set
+		    set
             {
                 if(value != null) 
                 {

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQStreamMessage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQStreamMessage.cs?rev=991699&r1=991698&r2=991699&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQStreamMessage.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQStreamMessage.cs
Wed Sep  1 20:50:08 2010
@@ -44,26 +44,21 @@ namespace Apache.NMS.ActiveMQ.Commands
 				long startingPos = this.byteBuffer.Position;
 				try
 				{
-					int type = this.dataIn.ReadByte();
+				    int type = this.dataIn.ReadByte();
 
-					if(type == PrimitiveMap.BOOLEAN_TYPE)
-					{
-						return this.dataIn.ReadBoolean();
-					}
-					else if(type == PrimitiveMap.STRING_TYPE)
-					{
-						return Boolean.Parse(this.dataIn.ReadString16());
-					}
-					else if(type == PrimitiveMap.NULL)
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new NMSException("Cannot convert Null type to a bool");
-					}
-					else
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new MessageFormatException("Value is not a Boolean type.");
-					}
+				    switch (type)
+				    {
+				        case PrimitiveMap.BOOLEAN_TYPE:
+				            return this.dataIn.ReadBoolean();
+				        case PrimitiveMap.STRING_TYPE:
+				            return Boolean.Parse(this.dataIn.ReadString16());
+				        case PrimitiveMap.NULL:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new NMSException("Cannot convert Null type to a bool");
+				        default:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new MessageFormatException("Value is not a Boolean type.");
+				    }
 				}
 				catch(FormatException e)
 				{
@@ -90,26 +85,21 @@ namespace Apache.NMS.ActiveMQ.Commands
 				long startingPos = this.byteBuffer.Position;
 				try
 				{
-					int type = this.dataIn.ReadByte();
+				    int type = this.dataIn.ReadByte();
 
-					if(type == PrimitiveMap.BYTE_TYPE)
-					{
-						return this.dataIn.ReadByte();
-					}
-					else if(type == PrimitiveMap.STRING_TYPE)
-					{
-						return Byte.Parse(this.dataIn.ReadString16());
-					}
-					else if(type == PrimitiveMap.NULL)
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new NMSException("Cannot convert Null type to a byte");
-					}
-					else
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new MessageFormatException("Value is not a Byte type.");
-					}
+				    switch (type)
+				    {
+				        case PrimitiveMap.BYTE_TYPE:
+				            return this.dataIn.ReadByte();
+				        case PrimitiveMap.STRING_TYPE:
+				            return Byte.Parse(this.dataIn.ReadString16());
+				        case PrimitiveMap.NULL:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new NMSException("Cannot convert Null type to a byte");
+				        default:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new MessageFormatException("Value is not a Byte type.");
+				    }
 				}
 				catch(FormatException e)
 				{
@@ -136,22 +126,19 @@ namespace Apache.NMS.ActiveMQ.Commands
 				long startingPos = this.byteBuffer.Position;
 				try
 				{
-					int type = this.dataIn.ReadByte();
+				    int type = this.dataIn.ReadByte();
 
-					if(type == PrimitiveMap.CHAR_TYPE)
-					{
-						return this.dataIn.ReadChar();
-					}
-					else if(type == PrimitiveMap.NULL)
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new NMSException("Cannot convert Null type to a char");
-					}
-					else
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new MessageFormatException("Value is not a Char type.");
-					}
+				    switch (type)
+				    {
+				        case PrimitiveMap.CHAR_TYPE:
+				            return this.dataIn.ReadChar();
+				        case PrimitiveMap.NULL:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new NMSException("Cannot convert Null type to a char");
+				        default:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new MessageFormatException("Value is not a Char type.");
+				    }
 				}
 				catch(FormatException e)
 				{
@@ -178,30 +165,23 @@ namespace Apache.NMS.ActiveMQ.Commands
 				long startingPos = this.byteBuffer.Position;
 				try
 				{
-					int type = this.dataIn.ReadByte();
+				    int type = this.dataIn.ReadByte();
 
-					if(type == PrimitiveMap.SHORT_TYPE)
-					{
-						return this.dataIn.ReadInt16();
-					}
-					else if(type == PrimitiveMap.BYTE_TYPE)
-					{
-						return this.dataIn.ReadByte();
-					}
-					else if(type == PrimitiveMap.STRING_TYPE)
-					{
-						return Int16.Parse(this.dataIn.ReadString16());
-					}
-					else if(type == PrimitiveMap.NULL)
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new NMSException("Cannot convert Null type to a short");
-					}
-					else
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new MessageFormatException("Value is not a Int16 type.");
-					}
+				    switch (type)
+				    {
+				        case PrimitiveMap.SHORT_TYPE:
+				            return this.dataIn.ReadInt16();
+				        case PrimitiveMap.BYTE_TYPE:
+				            return this.dataIn.ReadByte();
+				        case PrimitiveMap.STRING_TYPE:
+				            return Int16.Parse(this.dataIn.ReadString16());
+				        case PrimitiveMap.NULL:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new NMSException("Cannot convert Null type to a short");
+				        default:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new MessageFormatException("Value is not a Int16 type.");
+				    }
 				}
 				catch(FormatException e)
 				{
@@ -228,34 +208,25 @@ namespace Apache.NMS.ActiveMQ.Commands
 				long startingPos = this.byteBuffer.Position;
 				try
 				{
-					int type = this.dataIn.ReadByte();
+				    int type = this.dataIn.ReadByte();
 
-					if(type == PrimitiveMap.INTEGER_TYPE)
-					{
-						return this.dataIn.ReadInt32();
-					}
-					else if(type == PrimitiveMap.SHORT_TYPE)
-					{
-						return this.dataIn.ReadInt16();
-					}
-					else if(type == PrimitiveMap.BYTE_TYPE)
-					{
-						return this.dataIn.ReadByte();
-					}
-					else if(type == PrimitiveMap.STRING_TYPE)
-					{
-						return Int32.Parse(this.dataIn.ReadString16());
-					}
-					else if(type == PrimitiveMap.NULL)
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new NMSException("Cannot convert Null type to a int");
-					}
-					else
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new MessageFormatException("Value is not a Int32 type.");
-					}
+				    switch (type)
+				    {
+				        case PrimitiveMap.INTEGER_TYPE:
+				            return this.dataIn.ReadInt32();
+				        case PrimitiveMap.SHORT_TYPE:
+				            return this.dataIn.ReadInt16();
+				        case PrimitiveMap.BYTE_TYPE:
+				            return this.dataIn.ReadByte();
+				        case PrimitiveMap.STRING_TYPE:
+				            return Int32.Parse(this.dataIn.ReadString16());
+				        case PrimitiveMap.NULL:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new NMSException("Cannot convert Null type to a int");
+				        default:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new MessageFormatException("Value is not a Int32 type.");
+				    }
 				}
 				catch(FormatException e)
 				{
@@ -282,38 +253,27 @@ namespace Apache.NMS.ActiveMQ.Commands
 				long startingPos = this.byteBuffer.Position;
 				try
 				{
-					int type = this.dataIn.ReadByte();
+				    int type = this.dataIn.ReadByte();
 
-					if(type == PrimitiveMap.LONG_TYPE)
-					{
-						return this.dataIn.ReadInt64();
-					}
-					else if(type == PrimitiveMap.INTEGER_TYPE)
-					{
-						return this.dataIn.ReadInt32();
-					}
-					else if(type == PrimitiveMap.SHORT_TYPE)
-					{
-						return this.dataIn.ReadInt16();
-					}
-					else if(type == PrimitiveMap.BYTE_TYPE)
-					{
-						return this.dataIn.ReadByte();
-					}
-					else if(type == PrimitiveMap.STRING_TYPE)
-					{
-						return Int64.Parse(this.dataIn.ReadString16());
-					}
-					else if(type == PrimitiveMap.NULL)
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new NMSException("Cannot convert Null type to a long");
-					}
-					else
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new MessageFormatException("Value is not a Int64 type.");
-					}
+				    switch (type)
+				    {
+				        case PrimitiveMap.LONG_TYPE:
+				            return this.dataIn.ReadInt64();
+				        case PrimitiveMap.INTEGER_TYPE:
+				            return this.dataIn.ReadInt32();
+				        case PrimitiveMap.SHORT_TYPE:
+				            return this.dataIn.ReadInt16();
+				        case PrimitiveMap.BYTE_TYPE:
+				            return this.dataIn.ReadByte();
+				        case PrimitiveMap.STRING_TYPE:
+				            return Int64.Parse(this.dataIn.ReadString16());
+				        case PrimitiveMap.NULL:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new NMSException("Cannot convert Null type to a long");
+				        default:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new MessageFormatException("Value is not a Int64 type.");
+				    }
 				}
 				catch(FormatException e)
 				{
@@ -340,26 +300,21 @@ namespace Apache.NMS.ActiveMQ.Commands
 				long startingPos = this.byteBuffer.Position;
 				try
 				{
-					int type = this.dataIn.ReadByte();
+				    int type = this.dataIn.ReadByte();
 
-					if(type == PrimitiveMap.FLOAT_TYPE)
-					{
-						return this.dataIn.ReadSingle();
-					}
-					else if(type == PrimitiveMap.STRING_TYPE)
-					{
-						return Single.Parse(this.dataIn.ReadString16());
-					}
-					else if(type == PrimitiveMap.NULL)
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new NMSException("Cannot convert Null type to a float");
-					}
-					else
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new MessageFormatException("Value is not a Single type.");
-					}
+				    switch (type)
+				    {
+				        case PrimitiveMap.FLOAT_TYPE:
+				            return this.dataIn.ReadSingle();
+				        case PrimitiveMap.STRING_TYPE:
+				            return Single.Parse(this.dataIn.ReadString16());
+				        case PrimitiveMap.NULL:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new NMSException("Cannot convert Null type to a float");
+				        default:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new MessageFormatException("Value is not a Single type.");
+				    }
 				}
 				catch(FormatException e)
 				{
@@ -386,30 +341,23 @@ namespace Apache.NMS.ActiveMQ.Commands
 				long startingPos = this.byteBuffer.Position;
 				try
 				{
-					int type = this.dataIn.ReadByte();
+				    int type = this.dataIn.ReadByte();
 
-					if(type == PrimitiveMap.DOUBLE_TYPE)
-					{
-						return this.dataIn.ReadDouble();
-					}
-					else if(type == PrimitiveMap.FLOAT_TYPE)
-					{
-						return this.dataIn.ReadSingle();
-					}
-					else if(type == PrimitiveMap.STRING_TYPE)
-					{
-						return Single.Parse(this.dataIn.ReadString16());
-					}
-					else if(type == PrimitiveMap.NULL)
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new NMSException("Cannot convert Null type to a double");
-					}
-					else
-					{
-						this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-						throw new MessageFormatException("Value is not a Double type.");
-					}
+				    switch (type)
+				    {
+				        case PrimitiveMap.DOUBLE_TYPE:
+				            return this.dataIn.ReadDouble();
+				        case PrimitiveMap.FLOAT_TYPE:
+				            return this.dataIn.ReadSingle();
+				        case PrimitiveMap.STRING_TYPE:
+				            return Single.Parse(this.dataIn.ReadString16());
+				        case PrimitiveMap.NULL:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new NMSException("Cannot convert Null type to a double");
+				        default:
+				            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+				            throw new MessageFormatException("Value is not a Double type.");
+				    }
 				}
 				catch(FormatException e)
 				{
@@ -435,57 +383,36 @@ namespace Apache.NMS.ActiveMQ.Commands
 
 			try
 			{
-				int type = this.dataIn.ReadByte();
+			    int type = this.dataIn.ReadByte();
 
-				if(type == PrimitiveMap.BIG_STRING_TYPE)
-				{
-					return this.dataIn.ReadString32();
-				}
-				else if(type == PrimitiveMap.STRING_TYPE)
-				{
-					return this.dataIn.ReadString16();
-				}
-				else if(type == PrimitiveMap.LONG_TYPE)
-				{
-					return this.dataIn.ReadInt64().ToString();
-				}
-				else if(type == PrimitiveMap.INTEGER_TYPE)
-				{
-					return this.dataIn.ReadInt32().ToString();
-				}
-				else if(type == PrimitiveMap.SHORT_TYPE)
-				{
-					return this.dataIn.ReadInt16().ToString();
-				}
-				else if(type == PrimitiveMap.FLOAT_TYPE)
-				{
-					return this.dataIn.ReadSingle().ToString();
-				}
-				else if(type == PrimitiveMap.DOUBLE_TYPE)
-				{
-					return this.dataIn.ReadDouble().ToString();
-				}
-				else if(type == PrimitiveMap.CHAR_TYPE)
-				{
-					return this.dataIn.ReadChar().ToString();
-				}
-				else if(type == PrimitiveMap.BYTE_TYPE)
-				{
-					return this.dataIn.ReadByte().ToString();
-				}
-				else if(type == PrimitiveMap.BOOLEAN_TYPE)
-				{
-					return this.dataIn.ReadBoolean().ToString();
-				}
-				else if(type == PrimitiveMap.NULL)
-				{
-					return null;
-				}
-				else
-				{
-					this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-					throw new MessageFormatException("Value is not a known type.");
-				}
+			    switch (type)
+			    {
+			        case PrimitiveMap.BIG_STRING_TYPE:
+			            return this.dataIn.ReadString32();
+			        case PrimitiveMap.STRING_TYPE:
+			            return this.dataIn.ReadString16();
+			        case PrimitiveMap.LONG_TYPE:
+			            return this.dataIn.ReadInt64().ToString();
+			        case PrimitiveMap.INTEGER_TYPE:
+			            return this.dataIn.ReadInt32().ToString();
+			        case PrimitiveMap.SHORT_TYPE:
+			            return this.dataIn.ReadInt16().ToString();
+			        case PrimitiveMap.FLOAT_TYPE:
+			            return this.dataIn.ReadSingle().ToString();
+			        case PrimitiveMap.DOUBLE_TYPE:
+			            return this.dataIn.ReadDouble().ToString();
+			        case PrimitiveMap.CHAR_TYPE:
+			            return this.dataIn.ReadChar().ToString();
+			        case PrimitiveMap.BYTE_TYPE:
+			            return this.dataIn.ReadByte().ToString();
+			        case PrimitiveMap.BOOLEAN_TYPE:
+			            return this.dataIn.ReadBoolean().ToString();
+			        case PrimitiveMap.NULL:
+			            return null;
+			        default:
+			            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+			            throw new MessageFormatException("Value is not a known type.");
+			    }
 			}
 			catch(FormatException e)
 			{
@@ -565,64 +492,43 @@ namespace Apache.NMS.ActiveMQ.Commands
 
 			try
 			{
-				int type = this.dataIn.ReadByte();
+			    int type = this.dataIn.ReadByte();
 
-				if(type == PrimitiveMap.BIG_STRING_TYPE)
-				{
-					return this.dataIn.ReadString32();
-				}
-				else if(type == PrimitiveMap.STRING_TYPE)
-				{
-					return this.dataIn.ReadString16();
-				}
-				else if(type == PrimitiveMap.LONG_TYPE)
-				{
-					return this.dataIn.ReadInt64();
-				}
-				else if(type == PrimitiveMap.INTEGER_TYPE)
-				{
-					return this.dataIn.ReadInt32();
-				}
-				else if(type == PrimitiveMap.SHORT_TYPE)
-				{
-					return this.dataIn.ReadInt16();
-				}
-				else if(type == PrimitiveMap.FLOAT_TYPE)
-				{
-					return this.dataIn.ReadSingle();
-				}
-				else if(type == PrimitiveMap.DOUBLE_TYPE)
-				{
-					return this.dataIn.ReadDouble();
-				}
-				else if(type == PrimitiveMap.CHAR_TYPE)
-				{
-					return this.dataIn.ReadChar();
-				}
-				else if(type == PrimitiveMap.BYTE_TYPE)
-				{
-					return this.dataIn.ReadByte();
-				}
-				else if(type == PrimitiveMap.BOOLEAN_TYPE)
-				{
-					return this.dataIn.ReadBoolean();
-				}
-				else if(type == PrimitiveMap.BYTE_ARRAY_TYPE)
-				{
-					int length = this.dataIn.ReadInt32();
-					byte[] data = new byte[length];
-					this.dataIn.Read(data, 0, length);
-					return data;
-				}
-				else if(type == PrimitiveMap.NULL)
-				{
-					return null;
-				}
-				else
-				{
-					this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-					throw new MessageFormatException("Value is not a known type.");
-				}
+			    switch (type)
+			    {
+			        case PrimitiveMap.BIG_STRING_TYPE:
+			            return this.dataIn.ReadString32();
+			        case PrimitiveMap.STRING_TYPE:
+			            return this.dataIn.ReadString16();
+			        case PrimitiveMap.LONG_TYPE:
+			            return this.dataIn.ReadInt64();
+			        case PrimitiveMap.INTEGER_TYPE:
+			            return this.dataIn.ReadInt32();
+			        case PrimitiveMap.SHORT_TYPE:
+			            return this.dataIn.ReadInt16();
+			        case PrimitiveMap.FLOAT_TYPE:
+			            return this.dataIn.ReadSingle();
+			        case PrimitiveMap.DOUBLE_TYPE:
+			            return this.dataIn.ReadDouble();
+			        case PrimitiveMap.CHAR_TYPE:
+			            return this.dataIn.ReadChar();
+			        case PrimitiveMap.BYTE_TYPE:
+			            return this.dataIn.ReadByte();
+			        case PrimitiveMap.BOOLEAN_TYPE:
+			            return this.dataIn.ReadBoolean();
+			        case PrimitiveMap.BYTE_ARRAY_TYPE:
+			            {
+			                int length = this.dataIn.ReadInt32();
+			                byte[] data = new byte[length];
+			                this.dataIn.Read(data, 0, length);
+			                return data;
+			            }
+			        case PrimitiveMap.NULL:
+			            return null;
+			        default:
+			            this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
+			            throw new MessageFormatException("Value is not a known type.");
+			    }
 			}
 			catch(FormatException e)
 			{
@@ -920,7 +826,6 @@ namespace Apache.NMS.ActiveMQ.Commands
 				this.byteBuffer = null;
 			}
 		}
-
 	}
 }
 

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs?rev=991699&r1=991698&r2=991699&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs
Wed Sep  1 20:50:08 2010
@@ -356,12 +356,7 @@ namespace Apache.NMS.ActiveMQ.Transport.
 
 		public Object Narrow(Type type)
 		{
-			if(this.GetType().Equals(type))
-			{
-				return this;
-			}
-
-			return null;
+		    return this.GetType().Equals(type) ? this : null;
 		}
 
 	    public bool IsReconnectSupported



Mime
View raw message