You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2014/01/16 23:12:22 UTC

git commit: AMBARI-4322. Add relationship from Request to Request Schedule. Additional fix. (mpapirkovskyy)

Updated Branches:
  refs/heads/trunk e056203a2 -> 1fb20653b


AMBARI-4322. Add relationship from Request to Request Schedule. Additional fix. (mpapirkovskyy)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1fb20653
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1fb20653
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1fb20653

Branch: refs/heads/trunk
Commit: 1fb20653b1329c1ce07741e577dfc9bf7fbf8355
Parents: e056203
Author: mpapirkovskyy <mp...@hortonworks.com>
Authored: Fri Jan 17 00:11:06 2014 +0200
Committer: mpapirkovskyy <mp...@hortonworks.com>
Committed: Fri Jan 17 00:11:06 2014 +0200

----------------------------------------------------------------------
 .../java/org/apache/ambari/server/actionmanager/Request.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1fb20653/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java
index e4de0cb..5116ea9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java
@@ -142,7 +142,9 @@ public class Request {
     this.targetHosts = entity.getTargetHosts();
     this.requestType = entity.getRequestType();
     this.commandName = entity.getCommandName();
-    this.requestScheduleId = entity.getRequestScheduleEntity().getScheduleId();
+    if (entity.getRequestScheduleEntity() !=null) {
+      this.requestScheduleId = entity.getRequestScheduleEntity().getScheduleId();
+    }
 
     for (StageEntity stageEntity : entity.getStages()) {
       Stage stage = stageFactory.createExisting(stageEntity);