From 6f24b884653f45c17fdf7112d565d7a8285419f8 Mon Sep 17 00:00:00 2001
From: Vito Albano <valbano@MacPro.local>
Date: Tue, 20 Sep 2016 17:59:39 +0100
Subject: [PATCH] Removed return null from methods

---
 .../src/services/widget-visibility.service.spec.ts          | 4 ++--
 .../src/services/widget-visibility.service.ts               | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts
index b471335c30..0f977049f9 100644
--- a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts
@@ -236,11 +236,11 @@ describe('WidgetVisibilityService', () => {
     });
 
 
-    it('should return null if the variable does not exist', (done) => {
+    it('should return undefined if the variable does not exist', (done) => {
        service.getTaskProcessVariableModelsForTask(9999).subscribe(
             (res: TaskProcessVariableModel[]) => {
                let varValue = service.getValueFromVariable(formTest, 'TEST_MYSTERY_VAR', res);
-               expect(varValue).toBeNull();
+               expect(varValue).toBeUndefined();
                done();
             }
        );
diff --git a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts
index e53c2a1c33..1446344cca 100644
--- a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts
+++ b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts
@@ -128,20 +128,18 @@ export class WidgetVisibilityService {
         if ( form.json.variables) {
           let variableFromForm = form.json.variables.find(formVar => formVar.name === name);
           if ( variableFromForm ) {
-            return variableFromForm.value;
+            return variableFromForm ? variableFromForm.value : variableFromForm;
           }
         }
-        return null;
     }
 
     private getProcessVariableValue(name: string, processVarList: TaskProcessVariableModel[]) {
         if ( this.processVarList ) {
           let variableFromProcess = this.processVarList.find(variable => variable.id === name);
           if ( variableFromProcess ) {
-            return variableFromProcess.value;
+            return variableFromProcess ? variableFromProcess.value : variableFromProcess;
           }
         }
-        return null;
     }
 
     private evaluateLogicalOperation(logicOp, previousValue, newValue): boolean {