From 643578e1e7dcd9939394a230d64b9a0182f7e907 Mon Sep 17 00:00:00 2001
From: markpollack <mark.pollack@springsource.com>
Date: Fri, 18 Jul 2008 21:42:08 +0000
Subject: [PATCH] misc fixes for broken build

---
 .../Messaging/Nms/Connections/NmsTransactionManager.cs |  9 +++++----
 .../Nms/Connections/SingleConnectionFactory.cs         |  2 +-
 .../Nms/Listener/AbstractMessageListenerContainer.cs   | 10 ----------
 .../Messaging/Nms/Connections/TestConnection.cs        |  2 --
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsTransactionManager.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsTransactionManager.cs
index b3959c08..b018e9e2 100644
--- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsTransactionManager.cs
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsTransactionManager.cs
@@ -210,10 +210,11 @@ namespace Spring.Messaging.Nms.Connection
                     LOG.Debug("Committing NMS transaction on Session [" + session + "]");
                 }
                 session.Commit();
-                ///https://issues.apache.org/activemq/browse/AMQNET-93
-                ///TODO - need to mirror JMS exception classes in NMS API.
-                //} catch (TransactionRolledBackException ex)
-                //{
+                /** https://issues.apache.org/activemq/browse/AMQNET-93
+                   TODO - need to mirror JMS exception classes in NMS API.
+                   } catch (TransactionRolledBackException ex)
+                   {
+                 */
 
             }
             catch (NMSException ex)
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs
index 6b602a71..4b12520e 100644
--- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs
@@ -267,7 +267,7 @@ namespace Spring.Messaging.Nms.Connection
                 }
             } catch (Exception ex)
             {
-                LOG.Warn("Could not close shared NMS connection.");
+                LOG.Warn("Could not close shared NMS connection.", ex);
             }
         }
 
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs
index 318fa1b0..fd0c3113 100644
--- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs
@@ -578,16 +578,6 @@ namespace Spring.Messaging.Nms.Listener
 
         #endregion
 
-        protected virtual IConnection CreateConnection()
-        {
-            return ConnectionFactory.CreateConnection();
-        }
-
-        protected virtual ISession CreateSession(IConnection con)
-        {
-            return con.CreateSession(SessionAcknowledgeMode);
-        }
-
         protected virtual bool IsClientAcknowledge(ISession session)
         {
             return (session.AcknowledgementMode == AcknowledgementMode.ClientAcknowledge);
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnection.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnection.cs
index 98ecd5e8..db1b79bf 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnection.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnection.cs
@@ -8,8 +8,6 @@ namespace Spring.Messaging.Nms.Connection
         private int startCount;
         private int closeCount;
         private int createSessionCount;
-        private int closeSessionCount;
-
 
         public int StartCount
         {