Github user arunmahadevan commented on a diff in the pull request:

    https://github.com/apache/storm/pull/1557#discussion_r70657632
  
    --- Diff: storm-core/src/clj/org/apache/storm/ui/helpers.clj ---
    @@ -221,10 +221,7 @@
     (defnk json-response
       [data callback :serialize-fn to-json :status 200 :headers {}]
       {:status status
    -   :headers (merge {"Cache-Control" "no-cache, no-store"
    -                    "Access-Control-Allow-Origin" "*"
    -                    "Access-Control-Allow-Headers" "Content-Type, 
Access-Control-Allow-Headers, Access-Controler-Allow-Origin, X-Requested-By, 
X-Csrf-Token, Authorization, X-Requested-With"}
    -              (if (not-nil? callback) {"Content-Type" 
"application/javascript;charset=utf-8"}
    +   :headers ((if (not-nil? callback) {"Content-Type" 
"application/javascript;charset=utf-8"}
    --- End diff --
    
    I think you still need to put `merge` before the `if` since it has to be 
merged with the headers argument.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to