Skip to content

Commit b45fed0

Browse files
committed
Merge branch 'wdt-870' into 'main'
fixing issue with skipping app start when the app was not previously deployed See merge request weblogic-cloud/weblogic-deploy-tooling!1678
2 parents c116a97 + 804a85e commit b45fed0

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

core/src/main/python/wlsdeploy/tool/deploy/applications_online_deployer.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def deploy(self, is_restart_required=False):
5858
:raises: DeployException: if an error occurs
5959
"""
6060
_method_name = 'deploy'
61-
self.logger.entering(self._parent_name, self._parent_type,
61+
self.logger.entering(self._parent_name, self._parent_type, is_restart_required,
6262
class_name=self._class_name, method_name=_method_name)
6363

6464
# Make copies of the model dictionary since we are going
@@ -1229,6 +1229,12 @@ def __start_all_apps(self, deployed_app_list, base_location, is_restart_required
12291229
self.logger.entering(deployed_app_list, str_helper.to_string(base_location), is_restart_required,
12301230
class_name=self._class_name, method_name=_method_name)
12311231

1232+
if is_restart_required:
1233+
for app in deployed_app_list:
1234+
self.logger.notification('WLSDPLY-09800', app, class_name=self._class_name, method_name=_method_name)
1235+
self.logger.exiting(class_name=self._class_name, method_name=_method_name)
1236+
return
1237+
12321238
temp_app_dict = OrderedDict()
12331239
location = LocationContext(base_location).append_location(APPLICATION)
12341240
token_name = self.aliases.get_name_token(location)
@@ -1246,10 +1252,7 @@ def __start_all_apps(self, deployed_app_list, base_location, is_restart_required
12461252

12471253
start_order = self.__get_deployment_ordering(temp_app_dict)
12481254
for app in start_order:
1249-
if is_restart_required:
1250-
self.logger.notification('WLSDPLY-09800', app, class_name=self._class_name, method_name=_method_name)
1251-
else:
1252-
self.__start_app(app)
1255+
self.__start_app(app)
12531256

12541257
self.logger.exiting(class_name=self._class_name, method_name=_method_name)
12551258

0 commit comments

Comments
 (0)