--- trunk/libxmltv/Core/XMLTVRuntimeInstance.cs	2013/03/10 12:58:40	107
+++ trunk/libxmltv/Core/XMLTVRuntimeInstance.cs	2013/03/10 18:19:12	120
@@ -49,13 +49,13 @@
         private void init()
         {
             this.Source = new XMLTVSource();
-            this.Channels = new List<IXMLTVChannel>();
-            this.Programs = new List<IXMLTVProgram>();
+            this.Channels = new ChannelList();
+            this.Programs = new ProgramList();
             this.XmlFile_Name = string.Empty;
             this.XmlFile_FullName = string.Empty;
             this.XmlDoc = string.Empty;
             this.OnInstanceCreated = null;
-            this.ExtraEntries = new List<IExtraMetaData>();
+            this.ExtraEntries = new ExtraList();
         }
 
         #region IXMLTVRuntimeInstance members
@@ -72,13 +72,13 @@
         public string XmlDoc { get { return _XmlDoc; } set { _XmlDoc = value; } }
         private IXMLTVSource _Source;
         public IXMLTVSource Source { get { return _Source; } set { _Source = value; } }
-        private List<IXMLTVChannel> _Channels;
-        public List<IXMLTVChannel> Channels { get { return _Channels; } set { _Channels = value; } }
-        private List<IXMLTVProgram> _Programs;
-        public List<IXMLTVProgram> Programs { get { return _Programs; } set { _Programs = value; } }
+        private ChannelList _Channels;
+        public ChannelList Channels { get { return _Channels; } set { _Channels = value; } }
+        private ProgramList _Programs;
+        public ProgramList Programs { get { return _Programs; } set { _Programs = value; } }
 
-        private List<IExtraMetaData> _ExtraEntries;
-        public List<IExtraMetaData> ExtraEntries { get { return _ExtraEntries; } set { _ExtraEntries = value; } }
+        private ExtraList _ExtraEntries;
+        public ExtraList ExtraEntries { get { return _ExtraEntries; } set { _ExtraEntries = value; } }
         #endregion       
         #region IOnInstanceCreated members
         [NonSerialized]
@@ -341,6 +341,7 @@
                             var ctors = type.GetConstructors(flags);
                             bool has_default_ctor = false;
                             foreach (var ctor in ctors) { if (ctor.GetParameters().Count() == 0) { has_default_ctor = true; } }
+                            ctors = null;
                             if (!has_default_ctor) { continue; }
                             raw_instance = Activator.CreateInstance(type, flags, null, new object[0], culture);
                             if (raw_instance != null)
@@ -349,13 +350,23 @@
                                 if (handler_value != null && handler_value.ToString() == root_name)
                                 {
                                     handler_type = type;
+                                    handler_value = null;
+                                    raw_instance = null;
+                                    handler_prop = null;
+                                    iface = null;
                                     break;
                                 }
+                                handler_value = null;
                             }
+                            raw_instance = null;
                         }
+                        handler_prop = null;
                     }
+                    iface = null;
                 }
             }
+            asm = null;
+            types = null;
             if (handler_type == null) 
             {
                 StringBuilder node_builder = new StringBuilder();
@@ -366,15 +377,18 @@
             }
             xmltv_logger.Verbose.Debug.WriteLine("Created handler for root: '{0}'", root_name.ToString());
             raw_instance = Activator.CreateInstance(handler_type, flags, null, new object[] { gInstance }, culture);
+            raw_instance = null;
+            flags = 0;
+            culture = null;            
         }
 
         private bool CreateHandlerForNode(XElement node)
         {
             if (node == null) { throw new NullReferenceException("Node element is null"); }
             if (node.Name == null) { throw new NullReferenceException("Node element's Name is null"); }
-            var node_name = node.Name.ToString();
+            //var node_name = node.Name.ToString();
 
-            xmltv_logger.Verbose.Debug.WriteLine("Creating handler for node: '{0}'", node_name.ToString());
+            xmltv_logger.Verbose.Debug.WriteLine("Creating handler for node: '{0}'", node.Name.ToString());
             object raw_instance = null;
             BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
             CultureInfo culture = CultureInfo.CurrentCulture;
@@ -394,21 +408,32 @@
                             var ctors = type.GetConstructors(flags);
                             bool has_default_ctor = false;
                             foreach (var ctor in ctors) { if (ctor.GetParameters().Count() == 0) { has_default_ctor = true; } }
+                            ctors = null;
                             if (!has_default_ctor) { continue; }
                             raw_instance = Activator.CreateInstance(type, flags, null, new object[0], culture);
                             if (raw_instance != null)
                             {
                                 object handler_value = handler_prop.GetValue(raw_instance, null);
-                                if (handler_value != null && handler_value.ToString() == node_name)
+                                if (handler_value != null && handler_value.ToString() == node.Name.ToString())
                                 {
                                     handler_type = type;
+                                    handler_value = null;
+                                    raw_instance = null;
+                                    handler_prop = null;
+                                    iface = null;
                                     break;
                                 }
+                                handler_value = null;
                             }
+                            raw_instance = null;
                         }
+                        handler_prop = null;
                     }
+                    iface = null;
                 }
             }
+            asm = null;
+            types = null;
             if (handler_type == null)
             {
                 try
@@ -428,9 +453,13 @@
             }
             else
             {
-                xmltv_logger.Verbose.Debug.WriteLine("Created handler for node: '{0}'", node_name.ToString());
+                xmltv_logger.Verbose.Debug.WriteLine("Created handler for node: '{0}'", node.Name.ToString());
                 raw_instance = Activator.CreateInstance(handler_type, flags, null, new object[] { gInstance, node }, culture);                
             }
+            raw_instance = null;
+            flags = 0;
+            culture = null;
+            node = null;
             return true;
         }
         #region UnhandledExtraMetaData
@@ -446,7 +475,9 @@
                 {
                     ExtraMetaData data = new ExtraMetaData(node);
                     instance.ExtraEntries.Add(data);
+                    data = null;
                 }
+                node = null;
             }
         }
         #endregion