Fixing schema/scheme issue.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3fd46c3e Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3fd46c3e Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3fd46c3e Branch: refs/heads/0.10.x-branch Commit: 3fd46c3e95f970a2fc1ef7589ef94ed871165218 Parents: 8771436 Author: Kyle Nusbaum <kylejnusb...@gmail.com> Authored: Thu Oct 8 13:47:11 2015 -0500 Committer: Kyle Nusbaum <kylejnusb...@gmail.com> Committed: Thu Oct 8 13:47:11 2015 -0500 ---------------------------------------------------------------------- storm-core/src/clj/backtype/storm/ui/core.clj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/3fd46c3e/storm-core/src/clj/backtype/storm/ui/core.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj index 668769b..1aae3ef 100644 --- a/storm-core/src/clj/backtype/storm/ui/core.clj +++ b/storm-core/src/clj/backtype/storm/ui/core.clj @@ -958,17 +958,17 @@ (GET "/api/v1/topology/summary" [:as {:keys [cookies servlet-request]} & m] (assert-authorized-user servlet-request "getClusterInfo") (json-response (all-topologies-summary) (:callback m))) - (GET "/api/v1/topology/:id" [:as {:keys [cookies servlet-request schema]} id & m] + (GET "/api/v1/topology/:id" [:as {:keys [cookies servlet-request scheme params]} id & m] (let [user (.getUserName http-creds-handler servlet-request)] (assert-authorized-user servlet-request "getTopology" (topology-config id)) - (json-response (topology-page id (:window m) (check-include-sys? (:sys m)) user (= schema :https)) (:callback m)))) + (json-response (topology-page id (:window m) (check-include-sys? (:sys m)) user (= scheme :https)) (:callback m)))) (GET "/api/v1/topology/:id/visualization" [:as {:keys [cookies servlet-request]} id & m] (assert-authorized-user servlet-request "getTopology" (topology-config id)) (json-response (mk-visualization-data id (:window m) (check-include-sys? (:sys m))) (:callback m))) - (GET "/api/v1/topology/:id/component/:component" [:as {:keys [cookies servlet-request schema]} id component & m] + (GET "/api/v1/topology/:id/component/:component" [:as {:keys [cookies servlet-request scheme]} id component & m] (let [user (.getUserName http-creds-handler servlet-request)] (assert-authorized-user servlet-request "getTopology" (topology-config id)) - (json-response (component-page id component (:window m) (check-include-sys? (:sys m)) user (= schema :https)) (:callback m)))) + (json-response (component-page id component (:window m) (check-include-sys? (:sys m)) user (= scheme :https)) (:callback m)))) (POST "/api/v1/topology/:id/activate" [:as {:keys [cookies servlet-request]} id & m] (assert-authorized-user servlet-request "activate" (topology-config id)) (with-nimbus nimbus