You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jg...@apache.org on 2009/10/20 00:28:04 UTC

svn commit: r826842 - in /activemq/activemq-dotnet: Apache.NMS.ActiveMQ/trunk/ Apache.NMS.ActiveMQ/trunk/src/main/csharp/ Apache.NMS.EMS/trunk/src/main/csharp/ Apache.NMS.MSMQ/trunk/src/main/csharp/

Author: jgomes
Date: Mon Oct 19 22:27:37 2009
New Revision: 826842

URL: http://svn.apache.org/viewvc?rev=826842&view=rev
Log:
Update to latest NMS API changes.

Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/BytesMessage.cs
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/Connection.cs
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/StreamMessage.cs

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs?rev=826842&r1=826841&r2=826842&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs Mon Oct 19 22:27:37 2009
@@ -71,9 +71,22 @@
 			Dispose(false);
 		}
 
+		/// <summary>
+		/// A delegate that can receive transport level exceptions.
+		/// </summary>
 		public event ExceptionListener ExceptionListener;
-        public event ConnectionInterruptedListener ConnectionInterruptedListener;
-        public event ConnectionResumedListener ConnectionResumedListener;
+
+		/// <summary>
+		/// An asynchronous listener that is notified when a Fault tolerant connection
+		/// has been interrupted.
+		/// </summary>
+		public event ConnectionInterruptedListener ConnectionInterruptedListener;
+
+		/// <summary>
+		/// An asynchronous listener that is notified when a Fault tolerant connection
+		/// has been resumed.
+		/// </summary>
+		public event ConnectionResumedListener ConnectionResumedListener;
 
 		#region Properties
 

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj?rev=826842&r1=826841&r2=826842&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj Mon Oct 19 22:27:37 2009
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EB943C69-2C9B-45E7-B95B-FB916E7057ED}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -63,6 +63,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="src\test\csharp\Commands\ActiveMQBytesMessageTest.cs" />
+    <Compile Include="src\test\csharp\Commands\ActiveMQMapMessageTest.cs" />
     <Compile Include="src\test\csharp\Commands\ActiveMQMessageTest.cs" />
     <Compile Include="src\test\csharp\Commands\ActiveMQStreamMessageTest.cs" />
     <Compile Include="src\test\csharp\Commands\ActiveMQTextMessageTest.cs" />

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs?rev=826842&r1=826841&r2=826842&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs Mon Oct 19 22:27:37 2009
@@ -174,6 +174,9 @@
             set { this.tibcoConnection.ClientID = value; }
         }
 
+		/// <summary>
+		/// Gets the Meta Data for the NMS Connection instance.
+		/// </summary>
 		public IConnectionMetaData MetaData
 		{
 			get { return this.metaData ?? (this.metaData = new ConnectionMetaData()); }
@@ -181,7 +184,22 @@
 
 		#endregion
 
-		public event Apache.NMS.ExceptionListener ExceptionListener;
+		/// <summary>
+		/// A delegate that can receive transport level exceptions.
+		/// </summary>
+		public event ExceptionListener ExceptionListener;
+
+		/// <summary>
+		/// An asynchronous listener that is notified when a Fault tolerant connection
+		/// has been interrupted.
+		/// </summary>
+		public event ConnectionInterruptedListener ConnectionInterruptedListener;
+
+		/// <summary>
+		/// An asynchronous listener that is notified when a Fault tolerant connection
+		/// has been resumed.
+		/// </summary>
+		public event ConnectionResumedListener ConnectionResumedListener;
 
 		private void HandleTibcoException(object sender, TIBCO.EMS.EMSExceptionEventArgs arg)
 		{
@@ -194,5 +212,37 @@
 				Apache.NMS.Tracer.Error(arg.Exception);
 			}
 		}
+
+		private void HandleTransportInterrupted()
+		{
+			Tracer.Debug("Transport has been Interrupted.");
+
+			if(this.ConnectionInterruptedListener != null && !this.closed)
+			{
+				try
+				{
+					this.ConnectionInterruptedListener();
+				}
+				catch
+				{
+				}
+			}
+		}
+
+		private void HandleTransportResumed()
+		{
+			Tracer.Debug("Transport has resumed normal operation.");
+
+			if(this.ConnectionResumedListener != null && !this.closed)
+			{
+				try
+				{
+					this.ConnectionResumedListener();
+				}
+				catch
+				{
+				}
+			}
+		}
 	}
 }

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/BytesMessage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/BytesMessage.cs?rev=826842&r1=826841&r2=826842&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/BytesMessage.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/BytesMessage.cs Mon Oct 19 22:27:37 2009
@@ -86,11 +86,11 @@
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -103,7 +103,7 @@
 			}
 			catch(Exception e)
 			{
-				throw NMSExceptionSupport.create(e);
+				throw NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -116,11 +116,11 @@
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -133,7 +133,7 @@
 			}
 			catch(Exception e)
 			{
-				throw NMSExceptionSupport.create(e);
+				throw NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -146,11 +146,11 @@
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -163,7 +163,7 @@
 			}
 			catch(Exception e)
 			{
-				throw NMSExceptionSupport.create(e);
+				throw NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -176,11 +176,11 @@
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -193,7 +193,7 @@
 			}
 			catch(Exception e)
 			{
-				throw NMSExceptionSupport.create(e);
+				throw NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -206,11 +206,11 @@
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -223,7 +223,7 @@
 			}
 			catch(Exception e)
 			{
-				throw NMSExceptionSupport.create(e);
+				throw NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -236,11 +236,11 @@
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -253,7 +253,7 @@
 			}
 			catch(Exception e)
 			{
-				throw NMSExceptionSupport.create(e);
+				throw NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -266,11 +266,11 @@
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -283,7 +283,7 @@
 			}
 			catch(Exception e)
 			{
-				throw NMSExceptionSupport.create(e);
+				throw NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -296,11 +296,11 @@
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -313,7 +313,7 @@
 			}
 			catch(Exception e)
 			{
-				throw NMSExceptionSupport.create(e);
+				throw NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -326,11 +326,11 @@
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -343,11 +343,11 @@
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -360,7 +360,7 @@
 			}
 			catch(Exception e)
 			{
-				throw NMSExceptionSupport.create(e);
+				throw NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -373,7 +373,7 @@
 			}
 			catch(Exception e)
 			{
-				throw NMSExceptionSupport.create(e);
+				throw NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -387,11 +387,11 @@
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -405,7 +405,7 @@
 			}
 			catch(Exception e)
 			{
-				throw NMSExceptionSupport.create(e);
+				throw NMSExceptionSupport.Create(e);
 			}
 		}
 

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/Connection.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/Connection.cs?rev=826842&r1=826841&r2=826842&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/Connection.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/Connection.cs Mon Oct 19 22:27:37 2009
@@ -115,13 +115,31 @@
 			}
 		}
 
+		/// <summary>
+		/// Gets the Meta Data for the NMS Connection instance.
+		/// </summary>
 		public IConnectionMetaData MetaData
 		{
 			get { return this.metaData ?? (this.metaData = new ConnectionMetaData()); }
 		}
 
+		/// <summary>
+		/// A delegate that can receive transport level exceptions.
+		/// </summary>
 		public event ExceptionListener ExceptionListener;
 
+		/// <summary>
+		/// An asynchronous listener that is notified when a Fault tolerant connection
+		/// has been interrupted.
+		/// </summary>
+		public event ConnectionInterruptedListener ConnectionInterruptedListener;
+
+		/// <summary>
+		/// An asynchronous listener that is notified when a Fault tolerant connection
+		/// has been resumed.
+		/// </summary>
+		public event ConnectionResumedListener ConnectionResumedListener;
+
 		protected void CheckConnected()
 		{
 			if(closed)
@@ -143,7 +161,7 @@
 
 		public void HandleException(Exception e)
 		{
-			if(ExceptionListener != null)
+			if(ExceptionListener != null && !this.closed)
 			{
 				ExceptionListener(e);
 			}
@@ -152,5 +170,37 @@
 				Tracer.Error(e);
 			}
 		}
+
+		public void HandleTransportInterrupted()
+		{
+			Tracer.Debug("Transport has been Interrupted.");
+
+			if(this.ConnectionInterruptedListener != null && !this.closed)
+			{
+				try
+				{
+					this.ConnectionInterruptedListener();
+				}
+				catch
+				{
+				}
+			}
+		}
+
+		public void HandleTransportResumed()
+		{
+			Tracer.Debug("Transport has resumed normal operation.");
+
+			if(this.ConnectionResumedListener != null && !this.closed)
+			{
+				try
+				{
+					this.ConnectionResumedListener();
+				}
+				catch
+				{
+				}
+			}
+		}
 	}
 }

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/StreamMessage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/StreamMessage.cs?rev=826842&r1=826841&r2=826842&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/StreamMessage.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/StreamMessage.cs Mon Oct 19 22:27:37 2009
@@ -61,16 +61,16 @@
 				catch(FormatException e)
 				{
 					this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-					throw NMSExceptionSupport.createMessageFormatException(e);
+					throw NMSExceptionSupport.CreateMessageFormatException(e);
 				}
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -107,16 +107,16 @@
 				catch(FormatException e)
 				{
 					this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-					throw NMSExceptionSupport.createMessageFormatException(e);
+					throw NMSExceptionSupport.CreateMessageFormatException(e);
 				}
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -149,16 +149,16 @@
 				catch(FormatException e)
 				{
 					this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-					throw NMSExceptionSupport.createMessageFormatException(e);
+					throw NMSExceptionSupport.CreateMessageFormatException(e);
 				}
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -199,16 +199,16 @@
 				catch(FormatException e)
 				{
 					this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-					throw NMSExceptionSupport.createMessageFormatException(e);
+					throw NMSExceptionSupport.CreateMessageFormatException(e);
 				}
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -253,16 +253,16 @@
 				catch(FormatException e)
 				{
 					this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-					throw NMSExceptionSupport.createMessageFormatException(e);
+					throw NMSExceptionSupport.CreateMessageFormatException(e);
 				}
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -311,16 +311,16 @@
 				catch(FormatException e)
 				{
 					this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-					throw NMSExceptionSupport.createMessageFormatException(e);
+					throw NMSExceptionSupport.CreateMessageFormatException(e);
 				}
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -357,16 +357,16 @@
 				catch(FormatException e)
 				{
 					this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-					throw NMSExceptionSupport.createMessageFormatException(e);
+					throw NMSExceptionSupport.CreateMessageFormatException(e);
 				}
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -407,16 +407,16 @@
 				catch(FormatException e)
 				{
 					this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-					throw NMSExceptionSupport.createMessageFormatException(e);
+					throw NMSExceptionSupport.CreateMessageFormatException(e);
 				}
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -483,15 +483,15 @@
 			catch(FormatException e)
 			{
 				this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -542,11 +542,11 @@
 			}
 			catch(EndOfStreamException ex)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(ex);
+				throw NMSExceptionSupport.CreateMessageEOFException(ex);
 			}
 			catch(IOException ex)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(ex);
+				throw NMSExceptionSupport.CreateMessageFormatException(ex);
 			}
 		}
 
@@ -620,15 +620,15 @@
 			catch(FormatException e)
 			{
 				this.byteBuffer.Seek(startingPos, SeekOrigin.Begin);
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 			catch(EndOfStreamException e)
 			{
-				throw NMSExceptionSupport.createMessageEOFException(e);
+				throw NMSExceptionSupport.CreateMessageEOFException(e);
 			}
 			catch(IOException e)
 			{
-				throw NMSExceptionSupport.createMessageFormatException(e);
+				throw NMSExceptionSupport.CreateMessageFormatException(e);
 			}
 		}
 
@@ -642,7 +642,7 @@
 			}
 			catch(IOException e)
 			{
-				NMSExceptionSupport.create(e);
+				NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -656,7 +656,7 @@
 			}
 			catch(IOException e)
 			{
-				NMSExceptionSupport.create(e);
+				NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -677,7 +677,7 @@
 			}
 			catch(IOException e)
 			{
-				NMSExceptionSupport.create(e);
+				NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -691,7 +691,7 @@
 			}
 			catch(IOException e)
 			{
-				NMSExceptionSupport.create(e);
+				NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -705,7 +705,7 @@
 			}
 			catch(IOException e)
 			{
-				NMSExceptionSupport.create(e);
+				NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -719,7 +719,7 @@
 			}
 			catch(IOException e)
 			{
-				NMSExceptionSupport.create(e);
+				NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -733,7 +733,7 @@
 			}
 			catch(IOException e)
 			{
-				NMSExceptionSupport.create(e);
+				NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -747,7 +747,7 @@
 			}
 			catch(IOException e)
 			{
-				NMSExceptionSupport.create(e);
+				NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -761,7 +761,7 @@
 			}
 			catch(IOException e)
 			{
-				NMSExceptionSupport.create(e);
+				NMSExceptionSupport.Create(e);
 			}
 		}
 
@@ -783,7 +783,7 @@
 			}
 			catch(IOException e)
 			{
-				NMSExceptionSupport.create(e);
+				NMSExceptionSupport.Create(e);
 			}
 		}