From 1e30adc5ff63f184226e8dfaf6002cbb87208377 Mon Sep 17 00:00:00 2001 From: "Robert (Bobby) Evans" Date: Tue, 22 Nov 2016 12:22:56 -0600 Subject: [PATCH] STORM-2193: Fix FilterConfiguration parameter order --- storm-core/src/jvm/org/apache/storm/daemon/DrpcServer.java | 2 +- storm-core/src/jvm/org/apache/storm/ui/FilterConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storm-core/src/jvm/org/apache/storm/daemon/DrpcServer.java b/storm-core/src/jvm/org/apache/storm/daemon/DrpcServer.java index 442457d7733..21308fd5424 100644 --- a/storm-core/src/jvm/org/apache/storm/daemon/DrpcServer.java +++ b/storm-core/src/jvm/org/apache/storm/daemon/DrpcServer.java @@ -118,7 +118,7 @@ private void initHttp() throws Exception { if (drpcHttpPort != null && drpcHttpPort > 0) { String filterClass = (String) (conf.get(Config.DRPC_HTTP_FILTER)); Map filterParams = (Map) (conf.get(Config.DRPC_HTTP_FILTER_PARAMS)); - FilterConfiguration filterConfiguration = new FilterConfiguration(filterParams, filterClass); + FilterConfiguration filterConfiguration = new FilterConfiguration(filterClass, filterParams); final List filterConfigurations = Arrays.asList(filterConfiguration); final Integer httpsPort = Utils.getInt(conf.get(Config.DRPC_HTTPS_PORT), 0); final String httpsKsPath = (String) (conf.get(Config.DRPC_HTTPS_KEYSTORE_PATH)); diff --git a/storm-core/src/jvm/org/apache/storm/ui/FilterConfiguration.java b/storm-core/src/jvm/org/apache/storm/ui/FilterConfiguration.java index e8524972ef7..db5952e4305 100644 --- a/storm-core/src/jvm/org/apache/storm/ui/FilterConfiguration.java +++ b/storm-core/src/jvm/org/apache/storm/ui/FilterConfiguration.java @@ -25,7 +25,7 @@ public class FilterConfiguration { private Map filterParams; - public FilterConfiguration(Map filterParams, String filterClass) { + public FilterConfiguration(String filterClass, Map filterParams) { this.filterParams = filterParams; this.filterClass = filterClass; this.filterName = null;