Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestStaticMimeTypeServlet.java')
-rw-r--r--jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestStaticMimeTypeServlet.java13
1 files changed, 4 insertions, 9 deletions
diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestStaticMimeTypeServlet.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestStaticMimeTypeServlet.java
index 16f00b0d2e..f4e8b44034 100644
--- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestStaticMimeTypeServlet.java
+++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/TestStaticMimeTypeServlet.java
@@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.http.MimeTypes;
-import org.eclipse.jetty.io.Buffer;
/**
* Test servlet for testing against unusual MimeTypes and Content-Types.
@@ -48,7 +47,7 @@ public class TestStaticMimeTypeServlet extends TestDirContentServlet
mimeTypes.addMimeMapping("tga","application/tga");
mimeTypes.addMimeMapping("xcf","image/xcf");
mimeTypes.addMimeMapping("jp2","image/jpeg2000");
-
+
// Some of the other gzip mime-types seen in the wild.
// NOTE: Using oddball extensions just so that the calling request can specify
// which strange mime type to use.
@@ -70,15 +69,11 @@ public class TestStaticMimeTypeServlet extends TestDirContentServlet
response.setContentLength(dataBytes.length);
response.setHeader("ETag","W/etag-"+fileName);
- Buffer buf = mimeTypes.getMimeByExtension(fileName);
- if (buf == null)
- {
+ String mime = mimeTypes.getMimeByExtension(fileName);
+ if (mime == null)
response.setContentType("application/octet-stream");
- }
else
- {
- response.setContentType(buf.toString());
- }
+ response.setContentType(mime);
ServletOutputStream out = response.getOutputStream();
out.write(dataBytes);

Back to the top