Merge pull request #771 from oracle/WDT-500-dont-write-empty-restart-file

do not write empty restart file

Author: mriccell

core/src/main/python/deploy.py

@@ -161,7 +161,7 @@ def __deploy_online(model, model_context, aliases):
             __wlst_helper.activate(model_context.get_model_config().get_activate_timeout())
             if restart_required:
                 exit_code = CommandLineArgUtil.PROG_RESTART_REQUIRED
-                deployer_utils.list_restarts(model_context)
+                exit_code = deployer_utils.list_restarts(model_context, exit_code)
     except BundleAwareException, ex:
         __release_edit_session_and_disconnect()
         raise ex

core/src/main/python/update.py

@@ -199,7 +199,7 @@ def __check_update_require_domain_restart(model_context):
             __wlst_helper.activate(model_context.get_model_config().get_activate_timeout())
             if restart_required:
                 exit_code = CommandLineArgUtil.PROG_RESTART_REQUIRED
-                deployer_utils.list_restarts(model_context)
+                exit_code = deployer_utils.list_restarts(model_context, exit_code)
 
     except BundleAwareException, ex:
         __release_edit_session_and_disconnect()

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

@@ -453,26 +453,31 @@ def get_cluster_for_server(server_name, aliases):
     return cluster_name
 
 
-def list_restarts(model_context):
+def list_restarts(model_context, exit_code):
     """
     Get the list of restarts and save this list in format to restart.file
     in the -output_dirs location. If the output_dirs is not included, bypass
     writing to the restart file.
     :param model_context: instance of the tool model context
+    :param exit_code: current exit code for online restarts
     """
     _method_name = 'list_restarts'
     _logger.entering(model_context.get_output_dir(), class_name=_class_name, method_name=_method_name)
     restart_list = get_list_of_restarts()
     output_dirs = model_context.get_output_dir()
-    if output_dirs is not None:
+    result = exit_code
+    if len(restart_list) == 0:
+        result = 0
+    elif output_dirs is not None:
         file_name = os.path.join(output_dirs, 'restart.file')
         pw = FileUtils.getPrintWriter(file_name)
         for entry in restart_list:
             line = '%s:%s:%s:%s' % (entry[0], entry[1], entry[2], entry[3])
             _logger.finer('WLSDPLY-09208', line, class_name=_class_name, method_name=_method_name)
             pw.println(line)
         pw.close()
-    _logger.exiting(class_name=_class_name, method_name=_method_name)
+    _logger.exiting(class_name=_class_name, method_name=_method_name, result=result)
+    return result
 
 
 def get_list_of_restarts():