summaryrefslogtreecommitdiff
path: root/dotnet/Qpid.Client/Client
diff options
context:
space:
mode:
Diffstat (limited to 'dotnet/Qpid.Client/Client')
-rw-r--r--dotnet/Qpid.Client/Client/AmqBrokerInfo.cs2
-rw-r--r--dotnet/Qpid.Client/Client/AmqChannel.cs12
-rw-r--r--dotnet/Qpid.Client/Client/Collections/LinkedHashtable.cs2
-rw-r--r--dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs2
-rw-r--r--dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs2
-rw-r--r--dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs2
-rw-r--r--dotnet/Qpid.Client/Client/QpidConnectionInfo.cs2
7 files changed, 6 insertions, 18 deletions
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";