Fixing Table input binding issue

Azure · Mar 28, 2016 · 9f3104a · 9f3104a
1 parent 9e0f9fb
commit 9f3104a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/WebJobs.Script.WebHost/App_Start/WebApiConfig.cs b/src/WebJobs.Script.WebHost/App_Start/WebApiConfig.cs
@@ -117,7 +117,7 @@ private static WebHostSettings GetDefaultSettings()
             bool isLocal = string.IsNullOrEmpty(home);
             if (isLocal)
             {
-                settings.ScriptPath = Path.Combine(HostingEnvironment.ApplicationPhysicalPath, @"..\..\sample");
+                settings.ScriptPath = Environment.GetEnvironmentVariable("AzureWebJobsScriptRoot");
                 settings.LogPath = Path.Combine(Path.GetTempPath(), @"Functions");
                 settings.SecretsPath = HttpContext.Current.Server.MapPath("~/App_Data/Secrets");
             }
@@ -129,6 +129,11 @@ private static WebHostSettings GetDefaultSettings()
                 settings.SecretsPath = Path.Combine(home, @"data\Functions\secrets");
             }
 
+            if (string.IsNullOrEmpty(settings.ScriptPath))
+            {
+                throw new InvalidOperationException("Unable to determine function script root directory.");
+            }
+
             return settings;
         }
     }

diff --git a/src/WebJobs.Script/Binding/TableBinding.cs b/src/WebJobs.Script/Binding/TableBinding.cs
@@ -144,6 +144,8 @@ public override async Task BindAsync(BindingContext context)
             }
             else
             {
+                string json = null;
+
                 if (!string.IsNullOrEmpty(boundPartitionKey) &&
                     !string.IsNullOrEmpty(boundRowKey))
                 {
@@ -152,11 +154,7 @@ public override async Task BindAsync(BindingContext context)
                     DynamicTableEntity tableEntity = await context.Binder.BindAsync<DynamicTableEntity>(runtimeContext);
                     if (tableEntity != null)
                     {
-                        string json = ConvertEntityToJObject(tableEntity).ToString();
-                        using (StreamWriter sw = new StreamWriter(valueStream))
-                        {
-                            await sw.WriteAsync(json);
-                        }
+                        json = ConvertEntityToJObject(tableEntity).ToString();
                     }
                 }
                 else
@@ -172,11 +170,16 @@ public override async Task BindAsync(BindingContext context)
                         entityArray.Add(ConvertEntityToJObject(entity));
                     }
 
-                    string json = entityArray.ToString(Formatting.None);
-                    using (StreamWriter sw = new StreamWriter(valueStream))
-                    {
-                        await sw.WriteAsync(json);
-                    }
+                    json = entityArray.ToString(Formatting.None);
+                }
+
+                if (json != null)
+                {
+                    // We're explicitly NOT disposing the StreamWriter because
+                    // we don't want to close the underlying Stream
+                    StreamWriter sw = new StreamWriter(valueStream);
+                    await sw.WriteAsync(json);
+                    sw.Flush();
                 }
             }
         }