From e35c250c398f58d0cc4e957c3e2dcb7a28105a07 Mon Sep 17 00:00:00 2001 From: Christian Hornung Date: Sat, 29 Nov 2008 19:15:21 +0000 Subject: [PATCH] ResourceToolkit: Fixed exception when encountering an empty resource name in a ResourceManager constructor call. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3646 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Resolver/BclNRefactoryResourceResolver.cs | 2 +- .../BclNRefactoryResourceResolverTests.cs | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/AddIns/Misc/ResourceToolkit/Project/Src/Resolver/BclNRefactoryResourceResolver.cs b/src/AddIns/Misc/ResourceToolkit/Project/Src/Resolver/BclNRefactoryResourceResolver.cs index d843bd34ea..d01ee1a124 100644 --- a/src/AddIns/Misc/ResourceToolkit/Project/Src/Resolver/BclNRefactoryResourceResolver.cs +++ b/src/AddIns/Misc/ResourceToolkit/Project/Src/Resolver/BclNRefactoryResourceResolver.cs @@ -587,7 +587,7 @@ namespace Hornung.ResourceToolkit.Resolver PrimitiveExpression p = param as PrimitiveExpression; if (p != null) { string pValue = p.Value as string; - if (pValue != null) { + if (!String.IsNullOrEmpty(pValue)) { #if DEBUG LoggingService.Debug("ResourceToolkit: BclNRefactoryResourceResolver found string parameter: '"+pValue+"'"); diff --git a/src/AddIns/Misc/ResourceToolkit/Test/CSharp/BclNRefactoryResourceResolverTests.cs b/src/AddIns/Misc/ResourceToolkit/Test/CSharp/BclNRefactoryResourceResolverTests.cs index 672f9e62ab..efaa88150e 100644 --- a/src/AddIns/Misc/ResourceToolkit/Test/CSharp/BclNRefactoryResourceResolverTests.cs +++ b/src/AddIns/Misc/ResourceToolkit/Test/CSharp/BclNRefactoryResourceResolverTests.cs @@ -767,6 +767,25 @@ namespace Test { // ******************************************************************************************************************************** + const string CodeEmptyResourceSetName = @"using System.Resources; +class A { + void B() + { + ResourceManager mgr = new ResourceManager("""", System.Reflection.Assembly.GetExecutingAssembly()); + mgr.GetString(""TestKey""); + } +} +"; + + [Test] + public void EmptyResourceSetName() + { + ResourceResolveResult rrr = Resolve(CodeEmptyResourceSetName, 5, 17, null); + TestHelper.CheckNoReference(rrr); + } + + // ******************************************************************************************************************************** + [Test] public void ResolverSupportsCSharpFiles() {