Merge remote-tracking branch 'remotes/origin/master' into #33-build-s…

…ystem
project-flogo · Mar 4, 2019 · 716e50c · 716e50c
2 parents 15be89f + b30cab9
commit 716e50c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/action.go b/action.go
@@ -110,7 +110,7 @@ func (f *Factory) New(config *action.Config) (action.Action, error) {
 		act.id = config.Ref
 	}
 
-	if len(config.Data) > 0 {
+	if len(config.Data) > 0 && string(config.Data) != "null" {
 		err := json.Unmarshal(config.Data, &config.Settings)
 		if err != nil {
 			return nil, err