--- dao/DaoMqPump2/DaoMqPump2/Transport.cs	2014/05/16 21:10:02	2169
+++ dao/DaoMqPump2/DaoMqPump2/Transport.cs	2014/05/17 10:53:58	2172
@@ -148,7 +148,7 @@
             try
             {
                 //MQ Options
-                Hashtable connProps = getConnectionProperties();
+                Hashtable connProps = MQHelper.getConnectionProperties(controller.mqHost, controller.mqChannel);
                 int openOptions = MQC.MQOO_OUTPUT + MQC.MQOO_FAIL_IF_QUIESCING;
 
                 //MySQL Options
@@ -209,30 +209,9 @@
             }
             finally
             {
+                MQHelper.closeQueueSafe(out_queue);
+                MQHelper.closeQueueManagerSafe(mqMgr);
 
-                if (out_queue != null && out_queue.IsOpen)
-                {
-                    try
-                    {
-                        out_queue.Close();
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine("Error cleaning up qmgr " + e.Message);
-                    }
-                }
-
-                if (mqMgr != null && mqMgr.IsOpen)
-                {
-                    try
-                    {
-                        mqMgr.Close();
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine("Error cleaning up qmgr " + e.Message);
-                    }
-                }
 
             }
         }
@@ -248,7 +227,7 @@
                 try
                 {
                     //MQ options
-                    Hashtable connProps = getConnectionProperties();
+                    Hashtable connProps = MQHelper.getConnectionProperties(controller.mqHost, controller.mqChannel);
                     int openOptions = MQC.MQOO_INPUT_AS_Q_DEF + MQC.MQOO_FAIL_IF_QUIESCING;
 
                     //MySQL options
@@ -284,7 +263,7 @@
 
                                     // Hvis transaktionen starter med et ? er det ikke en gyldig transaktion
                                     // validér ligeledes at headeren er gyldig
-                                    if ( msgString.StartsWith("?") || Salt2Helper.validateSalt2Header(msgString) == false ) 
+                                    if ( Salt2Helper.validateSalt2Header(msgString) == false ) 
                                     {
                                         string discarded_filename = Logfile.getLogFilename(LogfileType.LogTransactions, controller.logDirectory, name);
                                         using (StreamWriter discardedlog = new StreamWriter(discarded_filename, true))
@@ -380,27 +359,8 @@
                 finally
                 {
 
-                    if (in_queue != null && in_queue.IsOpen)
-                    {
-                        try
-                        {
-                            in_queue.Close();
-                        }
-                        catch (Exception e)
-                        {
-                            Console.WriteLine("Error cleaning up qmgr " + e.Message);
-                        }
-                    }
-                    
-                    if (mqMgr != null && mqMgr.IsOpen)
-                    {
-                        try
-                        {
-                            mqMgr.Close();
-                        } catch (Exception e) {
-                            Console.WriteLine("Error cleaning up qmgr " + e.Message);
-                        }
-                    }
+                    MQHelper.closeQueueSafe(in_queue);
+                    MQHelper.closeQueueManagerSafe(mqMgr);
 
                 }
         }
@@ -419,15 +379,6 @@
             return connectionString;
         }
 
-        private Hashtable getConnectionProperties()
-        {
-            Hashtable connProperties = new Hashtable();
-            connProperties.Add(MQC.TRANSPORT_PROPERTY, MQC.TRANSPORT_MQSERIES_CLIENT);
-            connProperties.Add(MQC.HOST_NAME_PROPERTY, controller.mqHost);
-            connProperties.Add(MQC.CHANNEL_PROPERTY, controller.mqChannel);
-            return connProperties;
-        }
-
 
     }
 }