Skip to content

Commit 4ef5faf

Browse files
adding check for null attributes dictionary (#1009)
1 parent 67437c1 commit 4ef5faf

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -649,15 +649,18 @@ def __process_model_node(self, model_node, validation_location):
649649
def __validate_attributes(self, attributes_dict, valid_attr_infos, validation_location):
650650
_method_name = '__validate_attributes'
651651

652-
self._logger.finest('attributes_dict={0}', str(attributes_dict),
652+
self._logger.finest('validation_location={0}, attributes_dict={0}', str(validation_location), str(attributes_dict),
653653
class_name=_class_name, method_name=_method_name)
654654

655+
model_folder_path = self._aliases.get_model_folder_path(validation_location)
656+
if not isinstance(attributes_dict, dict):
657+
self._logger.severe('WLSDPLY-05038', model_folder_path, class_name=_class_name, method_name=_method_name)
658+
return
659+
655660
path_tokens_attr_keys = self._aliases.get_model_uses_path_tokens_attribute_names(validation_location)
656661
self._logger.finer('WLSDPLY-05013', str(validation_location), str(path_tokens_attr_keys),
657662
class_name=_class_name, method_name=_method_name)
658663

659-
model_folder_path = self._aliases.get_model_folder_path(validation_location)
660-
661664
for attribute_name, attribute_value in attributes_dict.iteritems():
662665
self.__validate_attribute(attribute_name, attribute_value, valid_attr_infos, path_tokens_attr_keys,
663666
model_folder_path, validation_location)

0 commit comments

Comments
 (0)