You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/09/17 16:25:58 UTC
[1/2] storm git commit: STORM-3225: Use MediaType for check
Repository: storm
Updated Branches:
refs/heads/master 80104fa45 -> dc70ffdba
STORM-3225: Use MediaType for check
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ceabe361
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ceabe361
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ceabe361
Branch: refs/heads/master
Commit: ceabe3613cd1ccdc5419b5da5fcab4ff988f305b
Parents: f5a410b
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Sep 14 11:58:46 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Sep 14 11:58:46 2018 -0500
----------------------------------------------------------------------
.../org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ceabe361/storm-webapp/src/main/java/org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java
index d13bfab..3f9c36b 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java
@@ -27,6 +27,7 @@ import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.container.ResourceInfo;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
import org.apache.commons.codec.Charsets;
@@ -79,7 +80,7 @@ public class AuthorizedUserFilter implements ContainerRequestFilter {
public static Response makeResponse(Exception ex, ContainerRequestContext request, int statusCode) {
String callback = null;
- if (request.getMediaType().toString().contains("application/json")) {
+ if (request.getMediaType() != null && request.getMediaType().equals(MediaType.APPLICATION_JSON_TYPE)) {
try {
String json = IOUtils.toString(request.getEntityStream(), Charsets.UTF_8);
InputStream in = IOUtils.toInputStream(json);
[2/2] storm git commit: Merge branch 'STORM-3225' of
https://github.com/revans2/incubator-storm into STORM-3225
Posted by bo...@apache.org.
Merge branch 'STORM-3225' of https://github.com/revans2/incubator-storm into STORM-3225
STORM-3225: Use MediaType for check
This closes #2833
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dc70ffdb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dc70ffdb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dc70ffdb
Branch: refs/heads/master
Commit: dc70ffdba026180f434997a87ed3434c409eb237
Parents: 80104fa ceabe36
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon Sep 17 11:10:38 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon Sep 17 11:10:38 2018 -0500
----------------------------------------------------------------------
.../org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------