svn commit: r1404680 - in /jmeter/trunk: src/core/org/apache/jmeter/samplers/SampleResult.java xdocs/changes.xml

[se...@apache.org]

Author: sebb
Date: Thu Nov  1 17:19:11 2012
New Revision: 1404680

URL: http://svn.apache.org/viewvc?rev=1404680&view=rev
Log:
The type video/f4m is text, not binary
Bugzilla Id: 54088

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1404680&r1=1404679&r2=1404680&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Thu Nov  1 17:19:11 2012
@@ -760,6 +760,11 @@ public class SampleResult implements Ser
         "video/",       //$NON-NLS-1$
         };
 
+    // List of types that are known to be ascii, although they may appear to be binary
+    private static final String[] NON_BINARY_TYPES = {
+        "video/f4m",       //$NON-NLS-1$ (Flash Media Manifest)
+        };
+
     /*
      * Determine if content-type is known to be binary, i.e. not displayable as text.
      *
@@ -767,6 +772,11 @@ public class SampleResult implements Ser
      * @return true if content-type is of type binary.
      */
     private static boolean isBinaryType(String ct){
+        for (String entry : NON_BINARY_TYPES){
+            if (ct.startsWith(entry)){
+                return false;
+            }
+        }
         for (int i = 0; i < BINARY_TYPES.length; i++){
             if (ct.startsWith(BINARY_TYPES[i])){
                 return true;

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1404680&r1=1404679&r2=1404680&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Thu Nov  1 17:19:11 2012
@@ -113,6 +113,7 @@ and right angle bracket (&gt;) in search
 
 <h3>Listeners</h3>
 <ul>
+<li><bugzilla>54088</bugzilla> - The type video/f4m is text, not binary</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>