Added Qpid.Client.Transport.Socket.Blocking project to MonoDevelop files.

Fixed some compiler warnings.


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

17 files changed, 64 insertions, 46 deletions

diff --git a/dotnet/Qpid.Buffer/ByteBuffer.cs b/dotnet/Qpid.Buffer/ByteBuffer.cs
index 1a43c0b9f3..d2941e8346 100644
--- a/dotnet/Qpid.Buffer/ByteBuffer.cs
+++ b/dotnet/Qpid.Buffer/ByteBuffer.cs
@@ -2375,14 +2375,6 @@ namespace Qpid.Buffer
             return this;
         }
 
-        private static void checkFieldSize( int fieldSize )
-        {
-            if( fieldSize < 0 )
-            {
-                throw new ArgumentOutOfRangeException("fieldSize");
-            }
-        }
-
         public abstract void put(ushort value);
         public abstract ushort GetUnsignedShort();
         public abstract uint GetUnsignedInt();
diff --git a/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.mdp b/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.mdp
index 00384843a8..2fc9d7801c 100644
--- a/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.mdp
+++ b/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.mdp
@@ -28,6 +28,7 @@
     <File name="./requestreply1/ServiceRequestingClient.cs" subtype="Code" buildaction="Compile" />
     <File name="./undeliverable/UndeliverableTest.cs" subtype="Code" buildaction="Compile" />
     <File name="./url/ConnectionUrlTest.cs" subtype="Code" buildaction="Compile" />
+    <File name="./log4net.config" subtype="Code" buildaction="FileCopy" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -36,5 +37,6 @@
     <ProjectReference type="Project" localcopy="True" refto="Qpid.Client" />
     <ProjectReference type="Project" localcopy="True" refto="Qpid.Messaging" />
     <ProjectReference type="Project" localcopy="True" refto="Qpid.Common" />
+    <ProjectReference type="Project" localcopy="True" refto="Qpid.Client.Transport.Socket.Blocking" />
   </References>
 </Project>
\ No newline at end of file
diff --git a/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs b/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
index 923d8c4049..0829b62e39 100644
--- a/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
+++ b/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
@@ -220,19 +220,19 @@ namespace Qpid.Client.Tests.failover
         {
             Console.WriteLine("TestWithBasicInfo");
             Console.WriteLine(".NET Framework version: " + RuntimeEnvironment.GetSystemVersion());
-            try
-            {
+//            try
+//            {
                 QpidConnectionInfo connectionInfo = new QpidConnectionInfo();
                 
                 connectionInfo.AddBrokerInfo(new AmqBrokerInfo("amqp", "localhost", 5672, false));
                 connectionInfo.AddBrokerInfo(new AmqBrokerInfo("amqp", "localhost", 5673, false));
                 
                 DoFailoverTxTest(connectionInfo);
-            }
-            catch (Exception e)
-            {
-                _log.Error("Exception caught", e);
-            }
+//            }
+//            catch (Exception e)
+//            {
+//                _log.Error("Exception caught", e);
+//            }
         }
 
         //[Test]
diff --git a/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs b/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
index dccfffd780..3e99c6f444 100644
--- a/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
+++ b/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
@@ -295,7 +295,7 @@ namespace Qpid.Client.Tests.url
                 QpidConnectionInfo.FromUrl(url);
                 Assert.Fail("URL has no virtual host should not parse");
             }
-            catch (UrlSyntaxException e)
+            catch (UrlSyntaxException)
             {
                 // This should occur.
             }
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs b/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
index 744a949d08..e85e42e08c 100644
--- a/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
+++ b/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
@@ -29,7 +29,7 @@ namespace Qpid.Client.Transport.Socket.Blocking
 {
     public class BlockingSocketTransport : ITransport
     {
-        static readonly ILog _log = LogManager.GetLogger(typeof(BlockingSocketTransport));
+//        static readonly ILog _log = LogManager.GetLogger(typeof(BlockingSocketTransport));
 
         // Configuration variables.
         string _host;
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp b/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp
new file mode 100644
index 0000000000..8f95000a4a
--- /dev/null
+++ b/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp
@@ -0,0 +1,30 @@
+<Project name="Qpid.Client.Transport.Socket.Blocking" fileversion="2.0" language="C#" clr-version="Net_1_1" ctype="DotNetProject">
+  <Configurations active="Debug">
+    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
+      <Output directory="./bin/Debug" assembly="Qpid.Client.Transport.Socket.Blocking" />
+      <Build debugmode="True" target="Library" />
+      <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" />
+      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+    <Configuration name="Release" ctype="DotNetProjectConfiguration">
+      <Output directory="./bin/Release" assembly="Qpid.Client.Transport.Socket.Blocking" />
+      <Build debugmode="False" target="Library" />
+      <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" />
+      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+  </Configurations>
+  <DeployTargets />
+  <Contents>
+    <File name="./Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
+    <File name="./BlockingSocketProcessor.cs" subtype="Code" buildaction="Compile" />
+    <File name="./BlockingSocketTransport.cs" subtype="Code" buildaction="Compile" />
+    <File name="./ByteChannel.cs" subtype="Code" buildaction="Compile" />
+  </Contents>
+  <References>
+    <ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Assembly" localcopy="True" refto="../Qpid.Common/lib/log4net/log4net.dll" />
+    <ProjectReference type="Project" localcopy="True" refto="Qpid.Buffer" />
+    <ProjectReference type="Project" localcopy="True" refto="Qpid.Client" />
+    <ProjectReference type="Project" localcopy="True" refto="Qpid.Common" />
+  </References>
+</Project>
\ No newline at end of file
diff --git a/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs b/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
index 36dd93d3d3..81a5f10647 100644
--- a/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
+++ b/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
@@ -122,7 +122,7 @@ namespace Qpid.Client
                                     found = true;
                                 }
                             }
-                            catch (Exception nfe) // XXX: should catch only "NumberFormatException" here
+                            catch (FormatException)
                             {
                                 looking = false;
                             }
diff --git a/dotnet/Qpid.Client/Client/AmqChannel.cs b/dotnet/Qpid.Client/Client/AmqChannel.cs
index 1ce273b1bc..d6557a8ee5 100644
--- a/dotnet/Qpid.Client/Client/AmqChannel.cs
+++ b/dotnet/Qpid.Client/Client/AmqChannel.cs
@@ -908,18 +908,6 @@ namespace Qpid.Client
             DoQueueDeclare(queueName, isDurable, isExclusive, isAutoDelete);
         }
 
-        private string DoDeclareQueue(AMQDestination amqd)
-        {
-            string queueName = amqd.QueueName;
-            bool isDurable = amqd.IsDurable;
-            bool isExclusive = amqd.IsExclusive;
-
-            DoQueueDeclare(queueName, isDurable, isExclusive, amqd.AutoDelete);
-
-            _logger.Debug("returning amqp.QueueName = " + amqd.QueueName);
-            return amqd.QueueName;
-        }
-
         private void DoQueueDeclare(string queueName, bool isDurable, bool isExclusive, bool isAutoDelete)
         {
             _logger.Debug(string.Format("DeclareQueue name={0} durable={1} exclusive={2}, auto-delete={3}",
diff --git a/dotnet/Qpid.Client/Client/Collections/LinkedHashtable.cs b/dotnet/Qpid.Client/Client/Collections/LinkedHashtable.cs
index 43e9a819e4..1497fdf70f 100644
--- a/dotnet/Qpid.Client/Client/Collections/LinkedHashtable.cs
+++ b/dotnet/Qpid.Client/Client/Collections/LinkedHashtable.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 
+/*
 namespace Qpid.Collections
 {
     public class LinkedHashtable : DictionaryBase
@@ -212,3 +213,4 @@ namespace Qpid.Collections
         }
     }
 }
+*/
\ No newline at end of file
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs b/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
index 0cd60457ea..bd8fac1127 100644
--- a/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
+++ b/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
@@ -32,7 +32,7 @@ namespace Qpid.Client.Handler
         public void MethodReceived(AMQStateManager stateManager, AMQMethodEvent evt)
         {
             _logger.Debug("ConnectionCloseOk frame received");
-            ConnectionCloseOkBody method = (ConnectionCloseOkBody)evt.Method;
+//            ConnectionCloseOkBody method = (ConnectionCloseOkBody)evt.Method;
             stateManager.ChangeState(AMQState.CONNECTION_CLOSED);
         }
     }
diff --git a/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs b/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
index c56ea28e53..efbeb9edcb 100644
--- a/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
+++ b/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
@@ -462,7 +462,7 @@ namespace Qpid.Client.Message
             }
         }
 
-        protected void Reset()
+        protected virtual void Reset()
         {
             _readableMessage = true;
         }
diff --git a/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs b/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
index 6287b05001..e15ab241f6 100644
--- a/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
+++ b/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
@@ -330,7 +330,7 @@ namespace Qpid.Client.Message
             _data.put(bytes, offset, length);
         }
 
-        public void Reset()
+        protected override void Reset()
         {
             base.Reset();
             _data.flip();
diff --git a/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs b/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
index 6c49a6c7ff..7207253603 100644
--- a/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
+++ b/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
@@ -358,8 +358,6 @@ namespace Qpid.Client
 
     public class QpidConnectionInfo : ConnectionInfo
     {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(QpidConnectionInfo));
-
         string _username = "guest";
         string _password = "guest";
         string _virtualHost = "/default";
diff --git a/dotnet/Qpid.Common/Collections/LinkedHashtable.cs b/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
index 55364f1aa1..c08d4a9197 100644
--- a/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
+++ b/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
@@ -191,13 +191,13 @@ namespace Qpid.Collections
             }
         }
 
-        private LinkedDictionaryEntry Tail
-        {
-            get
-            {
-                return _tail;
-            }
-        }
+//        private LinkedDictionaryEntry Tail
+//        {
+//            get
+//            {
+//                return _tail;
+//            }
+//        }
 
         private class LHTEnumerator : IDictionaryEnumerator
         {
diff --git a/dotnet/Qpid.Common/Collections/SynchronousQueue.cs b/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
index a678a6c5fc..c559a37b44 100644
--- a/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
+++ b/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
@@ -28,17 +28,17 @@ namespace Qpid.Collections
         /// <summary>
         /// Lock protecting both wait queues
         /// </summary> 
-        private readonly object _qlock = new object();
+//        private readonly object _qlock = new object();
         
         /// <summary>
         /// Queue holding waiting puts
         /// </summary> 
-        private readonly WaitQueue _waitingProducers;
+//        private readonly WaitQueue _waitingProducers;
         
         /// <summary>
         /// Queue holding waiting takes
         /// </summary> 
-        private readonly WaitQueue _waitingConsumers;
+//        private readonly WaitQueue _waitingConsumers;
         
         /**
          * Queue to hold waiting puts/takes; specialized to Fifo/Lifo below.
diff --git a/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs b/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
index 30be63013a..2e373402b6 100644
--- a/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
+++ b/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
@@ -130,7 +130,9 @@ namespace Qpid.Framing
             frame.PopulateFromBuffer(input, channel, bodySize, bodyFactory);
 
             byte marker = input.get();
-            //assert marker == 0xCE;
+            if (marker != 0xCE) {
+           		throw new FormatException("marker is not 0xCE"); 	
+            }
             return frame;
         }
 
diff --git a/dotnet/dotnet.mds b/dotnet/dotnet.mds
index d76d302d9e..c9520e7699 100644
--- a/dotnet/dotnet.mds
+++ b/dotnet/dotnet.mds
@@ -8,6 +8,7 @@
       <Entry build="True" name="Qpid.Client" configuration="Debug" />
       <Entry build="True" name="Qpid.Client.Tests" configuration="Debug" />
       <Entry build="True" name="Qpid.Common.Tests" configuration="Debug" />
+      <Entry build="True" name="Qpid.Client.Transport.Socket.Blocking" configuration="Debug" />
     </Configuration>
     <Configuration name="Release" ctype="CombineConfiguration">
       <Entry build="True" name="Qpid.Messaging" configuration="Release" />
@@ -17,6 +18,7 @@
       <Entry build="True" name="Qpid.Client" configuration="Release" />
       <Entry build="True" name="Qpid.Client.Tests" configuration="Release" />
       <Entry build="True" name="Qpid.Common.Tests" configuration="Release" />
+      <Entry build="True" name="Qpid.Client.Transport.Socket.Blocking" configuration="Release" />
     </Configuration>
   </Configurations>
   <DeployTargets />
@@ -28,6 +30,7 @@
     <Execute type="None" entry="Qpid.Client" />
     <Execute type="None" entry="Qpid.Client.Tests" />
     <Execute type="None" entry="Qpid.Common.Tests" />
+    <Execute type="None" entry="Qpid.Client.Transport.Socket.Blocking" />
   </StartMode>
   <Entries>
     <Entry filename="./Qpid.Messaging/Qpid.Messaging.mdp" />
@@ -37,5 +40,6 @@
     <Entry filename="./Qpid.Client/Qpid.Client.mdp" />
     <Entry filename="./Qpid.Client.Tests/Qpid.Client.Tests.mdp" />
     <Entry filename="./Qpid.Common.Tests/Qpid.Common.Tests.mdp" />
+    <Entry filename="./Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp" />
   </Entries>
 </Combine>
\ No newline at end of file