You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/02/25 16:13:28 UTC

[2/2] nifi git commit: NIFI-1539: - Comparing octet stream content type by using starts with and ignores case.

NIFI-1539: - Comparing octet stream content type by using starts with and ignores case.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0d13de0c
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0d13de0c
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0d13de0c

Branch: refs/heads/master
Commit: 0d13de0cf350cd6f5bef985303fe41fd8d769731
Parents: fc92441
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Feb 25 09:43:25 2016 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Feb 25 10:13:07 2016 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/nifi/web/ContentViewerController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/0d13de0c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java
index 65f9353..50ca101 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java
@@ -154,7 +154,7 @@ public class ContentViewerController extends HttpServlet {
 
             // when standalone and we don't know the type is null as we were able to directly access the content bypassing the rest endpoint,
             // when clustered and we don't know the type set to octet stream since the content was retrieved from the node's rest endpoint
-            if (downloadableContent.getType() == null || downloadableContent.getType().equals(MediaType.OCTET_STREAM.toString())) {
+            if (downloadableContent.getType() == null || StringUtils.startsWithIgnoreCase(downloadableContent.getType(), MediaType.OCTET_STREAM.toString())) {
                 // attempt to detect the content stream if we don't know what it is ()
                 final DefaultDetector detector = new DefaultDetector();