From 0cc2167e2f807fcd59e220916b4e0cdcc76e2563 Mon Sep 17 00:00:00 2001 From: DadanielZ Date: Tue, 7 Feb 2017 17:35:34 -0800 Subject: [PATCH] =?UTF-8?q?EAGLE-888=20Application=20submitted=20to=20Stor?= =?UTF-8?q?m=20is=20always=20shown=20as=20=E2=80=9CHBaseAuditLogApp?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reordered the "withFallBack" function to get user's topology configuration --- .../org/apache/eagle/app/service/ApplicationAction.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/service/ApplicationAction.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/service/ApplicationAction.java index a502f81b58..6b07b35820 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/service/ApplicationAction.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/service/ApplicationAction.java @@ -89,13 +89,13 @@ public ApplicationAction(Application application, ApplicationEntity metadata, Co if (serverConfig.hasPath(AlertConstants.COORDINATOR)) { this.effectiveConfig = ConfigFactory.parseMap(executionConfig) - .withFallback(serverConfig) .withFallback(ConfigFactory.parseMap(metadata.getContext())) + .withFallback(serverConfig) .withFallback(serverConfig.getConfig(AlertConstants.COORDINATOR)); } else { this.effectiveConfig = ConfigFactory.parseMap(executionConfig) - .withFallback(serverConfig) - .withFallback(ConfigFactory.parseMap(metadata.getContext())); + .withFallback(ConfigFactory.parseMap(metadata.getContext())) + .withFallback(serverConfig); } this.alertMetadataService = alertMetadataService; }