From 27d9d2b660477fb238e2eb9f76598d058bc5ff73 Mon Sep 17 00:00:00 2001
From: "Raghu Shantha [MSFT]" <raghus@microsoft.com>
Date: Tue, 29 Mar 2016 10:46:43 -0700
Subject: [PATCH] Fix for hang issue

---
 Engine/Helper.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Engine/Helper.cs b/Engine/Helper.cs
index 6ba8556b1..b3fea76e0 100644
--- a/Engine/Helper.cs
+++ b/Engine/Helper.cs
@@ -32,6 +32,7 @@ public class Helper
 
         private CommandInvocationIntrinsics invokeCommand;
         private IOutputWriter outputWriter;
+        private Object getCommandLock = new object();
 
         #endregion
 
@@ -567,7 +568,10 @@ public bool PositionalParameterUsed(CommandAst cmdAst, bool moreThanThreePositio
         /// <returns></returns>
         public CommandInfo GetCommandInfo(string name, CommandTypes commandType = CommandTypes.Alias | CommandTypes.Cmdlet | CommandTypes.Configuration | CommandTypes.ExternalScript | CommandTypes.Filter | CommandTypes.Function | CommandTypes.Script | CommandTypes.Workflow)
         {
-            return this.invokeCommand.GetCommand(name, commandType);
+            lock (getCommandLock)
+            {
+                return this.invokeCommand.GetCommand(name, commandType);
+            }
         }
 
         /// <summary>