[ambari] branch trunk updated: [AMBARI-24121] Saving request's end time when its status changes to a completed one (FAILED, COMPLETED, etc...) (#1575)

[smolnar]

This is an automated email from the ASF dual-hosted git repository.

smolnar pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 5ec9348  [AMBARI-24121] Saving request's end time when its status 
changes to a completed one (FAILED, COMPLETED, etc...) (#1575)
5ec9348 is described below

commit 5ec93487c1f7f38e34a50192aa8ffea2f7e93601
Author: Sandor Molnar <smol...@apache.org>
AuthorDate: Wed Jun 20 21:16:47 2018 +0200

    [AMBARI-24121] Saving request's end time when its status changes to a 
completed one (FAILED, COMPLETED, etc...) (#1575)
---
 .../org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
index 96a02be..3543486 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
@@ -214,6 +214,7 @@ public class ActionDBAccessorImpl implements 
ActionDBAccessor {
    */
   @Override
   public Collection<HostRoleCommandEntity> abortOperation(long requestId) {
+    Collection<HostRoleCommandEntity> abortedHostRoleCommands = 
Collections.emptyList();
     long now = System.currentTimeMillis();
 
     // only request commands which actually need to be aborted; requesting all
@@ -235,10 +236,10 @@ public class ActionDBAccessorImpl implements 
ActionDBAccessor {
 
     // no need to merge if there's nothing to merge
     if (!commands.isEmpty()) {
-      return hostRoleCommandDAO.mergeAll(commands);
+      abortedHostRoleCommands = hostRoleCommandDAO.mergeAll(commands);
     }
     endRequest(requestId);
-    return Collections.emptyList();
+    return abortedHostRoleCommands;
   }
 
   /* (non-Javadoc)