Skip to content

Commit 02cba02

Browse files
committed
Merge branch 'empty-classpath-element-fix' into 'main'
skipping empty classpath entries to address Bug 38483827 See merge request weblogic-cloud/weblogic-deploy-tooling!1833
2 parents 44ee1ad + 0e494ad commit 02cba02

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,10 @@ def _add_classpath_libraries_to_archive(self, model_name, model_value, location)
805805
if classpath_entries:
806806
classpath_list = []
807807
for classpath_entry in classpath_entries:
808+
if classpath_entry is None or len(classpath_entry) == 0:
809+
_logger.fine('WLSDPLY-06626')
810+
continue
811+
808812
classpath_entry = self._model_context.replace_token_string(classpath_entry)
809813
new_source_name = self._add_library(server_name, classpath_entry)
810814
if new_source_name is not None:
@@ -831,6 +835,11 @@ def _add_library(self, server_name, classpath_name):
831835
_method_name = '_add_library'
832836
_logger.entering(server_name, classpath_name, class_name=_class_name, method_name=_method_name)
833837
return_name = classpath_name
838+
839+
if classpath_name is None or len(classpath_name) == 0:
840+
_logger.fine('WLSDPLY-06626')
841+
return None
842+
834843
if self._is_file_to_exclude_from_archive(classpath_name):
835844
_logger.info('WLSDPLY-06618', classpath_name, server_name, class_name=_class_name, method_name=_method_name)
836845
return_name = self._model_context.tokenize_path(classpath_name)

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,6 +1110,7 @@ WLSDPLY-06624=Unable to locate and add {0} keystore file {1} for {2} {3} to the
11101110
attribute for {2} {3} has also been removed from the model. The SSL configuration for the {2} in the discovered \
11111111
model will not be valid.
11121112
WLSDPLY-06625=Failed to add {0} keystore file {1} for {2} {3} to the archive file: {4}
1113+
WLSDPLY-06626=Classpath entry is empty so skipping...
11131114

11141115
WLSDPLY-06627=Discovering NM Properties
11151116
WLSDPLY-06628=Discovering {0} Log Filters

0 commit comments

Comments
 (0)