GrowlConnector fixes (could hang if network connection is lost when r…

…eceiving response);removed buggy dictionary of loaded plugins that could cause a crash with same-named types in different assemblies
swsch · Jun 3, 2010 · 01da377 · 01da377
1 parent fc293f9
commit 01da377
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 14 deletions.
diff --git a/Growl Connectors/NET/libraries/Growl.Connector.dll b/Growl Connectors/NET/libraries/Growl.Connector.dll
diff --git a/Growl Connectors/NET/libraries/Growl.CoreLibrary.dll b/Growl Connectors/NET/libraries/Growl.CoreLibrary.dll
diff --git a/Growl Extras/Growl Display SDK/libraries/Growl.CoreLibrary.dll b/Growl Extras/Growl Display SDK/libraries/Growl.CoreLibrary.dll
diff --git a/Growl Extras/Growl Display SDK/libraries/Growl.DisplayStyle.dll b/Growl Extras/Growl Display SDK/libraries/Growl.DisplayStyle.dll
diff --git a/Growl/Growl.Connector/ConnectorBase.cs b/Growl/Growl.Connector/ConnectorBase.cs
@@ -274,6 +274,10 @@ private void SendAsync(object obj)
                         {
                             response += System.Text.Encoding.UTF8.GetString(buffer, 0, length);
                         }
+                        else
+                        {
+                            break;
+                        }
                     }
                     del(response);
 
@@ -290,6 +294,10 @@ private void SendAsync(object obj)
                             {
                                 response += System.Text.Encoding.UTF8.GetString(buffer, 0, length);
                             }
+                            else
+                            {
+                                break;
+                            }
                         }
                         del(response);
                     }

diff --git a/Growl/Growl.Connector/Properties/AssemblyInfo.cs b/Growl/Growl.Connector/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.3.5")]
-[assembly: AssemblyInformationalVersion("2.0.3")]
+[assembly: AssemblyFileVersion("2.0.4.1")]
+[assembly: AssemblyInformationalVersion("2.0.4")]
diff --git a/Growl/Growl.CoreLibrary/Properties/AssemblyInfo.cs b/Growl/Growl.CoreLibrary/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.3.5")]
-[assembly: AssemblyInformationalVersion("2.0.3")]
+[assembly: AssemblyFileVersion("2.0.4.1")]
+[assembly: AssemblyInformationalVersion("2.0.4")]
diff --git a/Growl/Growl/_source/DisplayStyleManager.cs b/Growl/Growl/_source/DisplayStyleManager.cs
@@ -21,7 +21,6 @@ internal sealed class DisplayStyleManager
         private static string userDisplayStyleDirectory = Growl.CoreLibrary.PathUtility.Combine(Utility.UserSettingFolder, @"Displays" + Path.DirectorySeparatorChar);
         private static string commonDisplayStyleDirectory = Growl.CoreLibrary.PathUtility.Combine(Utility.CommonPluginFolder, @"Displays" + Path.DirectorySeparatorChar);
 
-        private static Dictionary<string, LoadedDisplayStyle> currentlyLoadedDisplayStyles = new Dictionary<string, LoadedDisplayStyle>();
         private static Dictionary<string, SettingsPanelBase> settingsPanels = new Dictionary<string, SettingsPanelBase>();
         private static Dictionary<string, Display> availableDisplays = new Dictionary<string, Display>();
         private static Dictionary<string, PluginInfo> loadedPlugins = new Dictionary<string, PluginInfo>();
@@ -174,7 +173,6 @@ private static void LoadInternal(IDisplay display, string installPath, string se
                     }
 
                     loadedDisplayStyle.Load();
-                    currentlyLoadedDisplayStyles.Add(typeName, loadedDisplayStyle);
 
                     Utility.WriteDebugInfo(String.Format("Display '{0}' was loaded successfully", name));
 

diff --git a/Growl/Growl/_source/ForwardDestinationManager.cs b/Growl/Growl/_source/ForwardDestinationManager.cs
@@ -18,7 +18,6 @@ internal sealed class ForwardDestinationManager
         private static string userForwarderDirectory = Growl.CoreLibrary.PathUtility.Combine(Utility.UserSettingFolder, @"Forwarders" + Path.DirectorySeparatorChar);
         private static string commonForwarderDirectory = Growl.CoreLibrary.PathUtility.Combine(Utility.CommonPluginFolder, @"Forwarders" + Path.DirectorySeparatorChar);
 
-        private static Dictionary<string, IForwardDestinationHandler> loadedHandlers = new Dictionary<string, IForwardDestinationHandler>();
         private static List<IForwardDestinationHandler> loadedHandlersList = new List<IForwardDestinationHandler>();
         private static Dictionary<string, PluginInfo> loadedPlugins = new Dictionary<string, PluginInfo>();
         private static List<PluginInfo> loadedPluginsList = new List<PluginInfo>();
@@ -160,9 +159,6 @@ private static void LoadInternal(IForwardDestinationHandler fdh, string installP
                 if (fdh != null)
                 {
                     name = fdh.Name;
-                    string typeName = fdh.GetType().FullName;
-
-                    loadedHandlers.Add(typeName, fdh);
                     loadedHandlersList.Add(fdh);
 
                     List<Type> list = fdh.Register();

diff --git a/Growl/Growl/_source/SubscriptionManager.cs b/Growl/Growl/_source/SubscriptionManager.cs
@@ -18,7 +18,6 @@ internal sealed class SubscriptionManager
         private static string userSubscriberDirectory = Growl.CoreLibrary.PathUtility.Combine(Utility.UserSettingFolder, @"Subscribers" + Path.DirectorySeparatorChar);
         private static string commonSubscriberDirectory = Growl.CoreLibrary.PathUtility.Combine(Utility.CommonPluginFolder, @"Subscribers" + Path.DirectorySeparatorChar);
 
-        private static Dictionary<string, ISubscriptionHandler> loadedHandlers = new Dictionary<string, ISubscriptionHandler>();
         private static List<ISubscriptionHandler> loadedHandlersList = new List<ISubscriptionHandler>();
         private static Dictionary<string, PluginInfo> loadedPlugins = new Dictionary<string, PluginInfo>();
         private static List<PluginInfo> loadedPluginsList = new List<PluginInfo>();
@@ -157,9 +156,7 @@ private static void LoadInternal(ISubscriptionHandler ish, string installPath, s
                 if (ish != null)
                 {
                     name = ish.Name;
-                    string typeName = ish.GetType().FullName;
 
-                    loadedHandlers.Add(typeName, ish);
                     loadedHandlersList.Add(ish);
 
                     List<Type> list = ish.Register();

diff --git a/Growl/Growl/release_notes.txt b/Growl/Growl/release_notes.txt
@@ -1,6 +1,11 @@
+2.0.4 changes (v2.0.4.x)
+------------------------------
+- fixed a bug in GrowlConnector that could cause a hang if the connection was lost in the middle of receiving a response
+
+
 2.0.3v2 changes (v2.0.3.5)
 ------------------------------
-- fixed a but in the IPv6 same-subnet handling
+- fixed a bug in the IPv6 same-subnet handling
 
 2.0.3 changes (v2.0.3.4)
 ------------------------------