From 3f4d469d4a6ece375bbd210539cf384adff07839 Mon Sep 17 00:00:00 2001
From: Brian Murphy <brian.p.murphy@gmail.com>
Date: Thu, 4 Dec 2014 15:10:18 +0000
Subject: [PATCH] FIX: Fixes after merge fail.

Original commit: elastic/x-pack-elasticsearch@6bab2d26401762d6ff76c98dffac41f69ba52856
---
 .../org/elasticsearch/alerts/actions/AlertActionManager.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java b/src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java
index e6b06b6ec04..4ccf3b80add 100644
--- a/src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java
+++ b/src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java
@@ -373,8 +373,8 @@ public class AlertActionManager extends AbstractComponent {
                     } else if (entry.getState() != AlertActionState.THROTTLED) {
                         entry.setState(AlertActionState.ACTION_PERFORMED);
                     }
-                    entry.setPayloadRequest(trigger.getPayloadRequest());
-                    entry.setPayloadResponse(trigger.getPayloadResponse());
+                    entry.setPayloadRequest(result.getPayloadRequest());
+                    entry.setPayloadResponse(result.getPayloadResponse());
                 } else {
                     entry.setState(AlertActionState.NO_ACTION_NEEDED);
                 }