Merge pull request #12 from martincostello/Remove-Redundant-Code

Remove redundant code
martincostello · Nov 5, 2019 · b50b629 · b50b629
2 parents 1ef99fa + 53100d5
commit b50b629
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 14 deletions.
diff --git a/LambdaTestServer.ruleset → AwsLambdaTestServer.ruleset b/LambdaTestServer.ruleset → AwsLambdaTestServer.ruleset
diff --git a/AwsLambdaTestServer.sln b/AwsLambdaTestServer.sln
@@ -14,15 +14,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 		.travis.yml = .travis.yml
 		appveyor.yml = appveyor.yml
+		AwsLambdaTestServer.ruleset = AwsLambdaTestServer.ruleset
+		AwsLambdaTestServer.snk = AwsLambdaTestServer.snk
 		Build.ps1 = Build.ps1
 		build.sh = build.sh
 		CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
 		CommonAssemblyInfo.cs = CommonAssemblyInfo.cs
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		global.json = global.json
-		LambdaTestServer.ruleset = LambdaTestServer.ruleset
-		LambdaTestServer.snk = LambdaTestServer.snk
 		LICENSE = LICENSE
 		NuGet.config = NuGet.config
 		README.md = README.md

diff --git a/LambdaTestServer.snk → AwsLambdaTestServer.snk b/LambdaTestServer.snk → AwsLambdaTestServer.snk
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -15,9 +15,9 @@
   </ItemGroup>
   <PropertyGroup>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)LambdaTestServer.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)AwsLambdaTestServer.snk</AssemblyOriginatorKeyFile>
     <Authors>martin_costello</Authors>
-    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)LambdaTestServer.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)AwsLambdaTestServer.ruleset</CodeAnalysisRuleSet>
     <Company>https://github.com/martincostello/lambda-test-server</Company>
     <Copyright>Martin Costello (c) $([System.DateTime]::Now.ToString(yyyy))</Copyright>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>

diff --git a/src/AwsLambdaTestServer/RuntimeHandler.cs b/src/AwsLambdaTestServer/RuntimeHandler.cs
@@ -318,16 +318,7 @@ private async Task CompleteRequestChannelAsync(
             bool isSuccessful,
             CancellationToken cancellationToken)
         {
-            if (!_responses.TryRemove(awsRequestId, out var context))
-            {
-                Logger.LogError(
-                    "Could not find response channel with AWS request Id {AwsRequestId} for Lambda function with ARN {FunctionArn}.",
-                    awsRequestId,
-                    _options.FunctionArn);
-
-                return;
-            }
-
+            var context = _responses[awsRequestId];
             context.DurationTimer.Stop();
 
             Logger.LogInformation(