--- dao/DaoMqPump2/MQFilter/FilterController.cs	2014/05/16 21:50:17	2171
+++ dao/DaoMqPump2/MQFilter/FilterController.cs	2014/05/17 10:53:58	2172
@@ -83,14 +83,7 @@
         }
 
 
-        private Hashtable getConnectionProperties()
-        {
-            Hashtable connProperties = new Hashtable();
-            connProperties.Add(MQC.TRANSPORT_PROPERTY, MQC.TRANSPORT_MQSERIES_CLIENT);
-            connProperties.Add(MQC.HOST_NAME_PROPERTY, mqHost);
-            connProperties.Add(MQC.CHANNEL_PROPERTY, mqChannel);
-            return connProperties;
-        }
+
 
 
         public void transportAllMessages()
@@ -105,7 +98,7 @@
             try
             {
                 //MQ options
-                Hashtable connProps = getConnectionProperties();
+                Hashtable connProps = MQHelper.getConnectionProperties(mqHost, mqChannel);
                 int openInputOptions = MQC.MQOO_INPUT_AS_Q_DEF + MQC.MQOO_FAIL_IF_QUIESCING;
                 int openOutputOptions = MQC.MQOO_OUTPUT + MQC.MQOO_FAIL_IF_QUIESCING;
 
@@ -133,18 +126,17 @@
                         queueIndbakke.Get(mqMsg, mqGetMsgOpts);
                         if (mqMsg.Format.CompareTo(MQC.MQFMT_STRING) == 0)
                         {
-                            string saltiiString = mqMsg.ReadString(mqMsg.MessageLength);
+                            string salt2String = mqMsg.ReadString(mqMsg.MessageLength);
                             //System.Console.WriteLine(msgString);
 
 
-                            // Hvis transaktionen starter med et ? er det ikke en gyldig transaktion
-                            // validér ligeledes at headeren er gyldig
-                            if (saltiiString.StartsWith("?") || Salt2Helper.validateSalt2Header(saltiiString) == false)
+                            // validér at headeren er gyldig
+                            if ( Salt2Helper.validateSalt2Header(salt2String) == false)
                             {
                                 string discarded_filename = Logfile.getLogFilename(LogfileType.LogTransactions, logDirectory, "filter");
                                 using (StreamWriter discardedlog = new StreamWriter(discarded_filename, true))
                                 {
-                                    discardedlog.WriteLine(Logfile.getNowString() + " " + saltiiString);
+                                    discardedlog.WriteLine(Logfile.getNowString() + " " + salt2String);
                                 }
                                 continue; //gå frem til at tage næste transaktion fra køen
                             }
@@ -155,9 +147,9 @@
                             MQMessage msg = new MQMessage();
                             msg.Format = MQC.MQFMT_STRING;
                             msg.CharacterSet = 1252;
-                            msg.WriteString(saltiiString);
+                            msg.WriteString(salt2String);
 
-                            Salt2Header header = Salt2Helper.parseHeader(saltiiString);
+                            Salt2Header header = Salt2Helper.parseHeader(salt2String);
                             queueMysql.Put(msg, pmo);
                             if (saveForLater(header))
                             {
@@ -211,23 +203,12 @@
             }
             finally
             {
-                closeQueue(queueIndbakke);
-                closeQueue(queueMysql);
-                closeQueue(queueDimaps);
-                closeQueue(queueStore);
+                MQHelper.closeQueueSafe(queueIndbakke);
+                MQHelper.closeQueueSafe(queueMysql);
+                MQHelper.closeQueueSafe(queueDimaps);
+                MQHelper.closeQueueSafe(queueStore);
 
-
-                if (mqMgr != null && mqMgr.IsOpen)
-                {
-                    try
-                    {
-                        mqMgr.Close();
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine("Error cleaning up qmgr " + e.Message);
-                    }
-                }
+                MQHelper.closeQueueManagerSafe(mqMgr);
             }
         }
 
@@ -267,21 +248,6 @@
             return false;            
         }
 
-        private void closeQueue(MQQueue queue)
-        {
-            if (queue != null && queue.IsOpen)
-            {
-                try
-                {
-                    queue.Close();
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine("Error cleaning up queue " + e.Message);
-                }
-            }
-
-        }