Removed check for variable_file_name in model_context, if non-None variable_file_name was passed in

Author: mwooten

core/src/main/python/wlsdeploy/tool/validate/validator.py

@@ -212,8 +212,7 @@ def __validate_model_file(self, model_dict, variables_file_name, archive_file_na
         if variables_file_name is not None:
             self._logger.info('WLSDPLY-05004', variables_file_name, class_name=_class_name, method_name=_method_name)
             try:
-                if self._model_context.get_variable_file():
-                    self._variable_properties = variables.load_variables(self._model_context.get_variable_file())
+                self._variable_properties = variables.load_variables(variables_file_name)
                 variables.substitute(model_dict, self._variable_properties)
             except VariableException, ve:
                 ex = exception_helper.create_validate_exception('WLSDPLY-20004', 'validateModel',