From b612c9740b00f08a732874c50b6ea3904f353b6d Mon Sep 17 00:00:00 2001
From: Dennis Oelkers <dennis@graylog.com>
Date: Tue, 29 Mar 2016 17:02:40 +0200
Subject: [PATCH] Use all fields from input entity to merge with updates.

Fixes #1988
---
 .../graylog2/rest/resources/system/inputs/InputsResource.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graylog2-server/src/main/java/org/graylog2/rest/resources/system/inputs/InputsResource.java b/graylog2-server/src/main/java/org/graylog2/rest/resources/system/inputs/InputsResource.java
index d499d17896f8..715aeff737eb 100644
--- a/graylog2-server/src/main/java/org/graylog2/rest/resources/system/inputs/InputsResource.java
+++ b/graylog2-server/src/main/java/org/graylog2/rest/resources/system/inputs/InputsResource.java
@@ -176,7 +176,7 @@ public Response update(@ApiParam(name = "JSON body", required = true) @Valid @No
 
         final Input input = inputService.find(inputId);
 
-        final Map<String, Object> mergedInput = inputService.getMessageInput(input).asMap();
+        final Map<String, Object> mergedInput = input.getFields();
         final MessageInput messageInput = messageInputFactory.create(lr, getCurrentUser().getName(), lr.node());
 
         messageInput.checkConfiguration();