Fixing trigger name resolution in C# invoker

fabiocav · fabiocav · commit c93dac20ddd7 · 2016-03-06T15:58:37.000-08:00
diff --git a/src/WebJobs.Script/Description/CSharp/CSharpFunctionInvoker.cs b/src/WebJobs.Script/Description/CSharp/CSharpFunctionInvoker.cs
@@ -66,13 +66,14 @@ internal CSharpFunctionInvoker(ScriptHost host, FunctionMetadata functionMetadat
         private static string GetTriggerInputName(FunctionMetadata functionMetadata)
         {
             BindingMetadata triggerBinding = functionMetadata.Bindings.FirstOrDefault(b => b.IsTrigger);
-            
+
+            string triggerName = null;
             if (triggerBinding != null)
             {
-                return triggerBinding.Name;
+                triggerName = triggerBinding.Name;
             }
 
-            return DefaultInputName;
+            return triggerName ?? DefaultInputName;
         }
 
         protected override void OnScriptFileChanged(object sender, FileSystemEventArgs e)

Original file line number	Diff line number	Diff line change
`@@ -66,13 +66,14 @@ internal CSharpFunctionInvoker(ScriptHost host, FunctionMetadata functionMetadat`
`66`	`66`	`private static string GetTriggerInputName(FunctionMetadata functionMetadata)`
`67`	`67`	`{`
`68`	`68`	`BindingMetadata triggerBinding = functionMetadata.Bindings.FirstOrDefault(b => b.IsTrigger);`
`69`		`-`
	`69`	`+`
	`70`	`+ string triggerName = null;`
`70`	`71`	`if (triggerBinding != null)`
`71`	`72`	`{`
`72`		`- return triggerBinding.Name;`
	`73`	`+ triggerName = triggerBinding.Name;`
`73`	`74`	`}`
`74`	`75`
`75`		`- return DefaultInputName;`
	`76`	`+ return triggerName ?? DefaultInputName;`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`protected override void OnScriptFileChanged(object sender, FileSystemEventArgs e)`