diff options
| author | Greg Wilkins | 2013-05-31 08:07:01 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2013-05-31 08:07:01 +0000 |
| commit | 0e11c8230712c2ce2206fc30f9606d640a231c0d (patch) | |
| tree | b52e29a8ed7f1768876d5f6ddd03bdd6ff265acd /jetty-servlet | |
| parent | 842309e656f8ca6e99a523ddbf98542fcab9ac47 (diff) | |
| download | org.eclipse.jetty.project-0e11c8230712c2ce2206fc30f9606d640a231c0d.tar.gz org.eclipse.jetty.project-0e11c8230712c2ce2206fc30f9606d640a231c0d.tar.xz org.eclipse.jetty.project-0e11c8230712c2ce2206fc30f9606d640a231c0d.zip | |
fixed merge
Diffstat (limited to 'jetty-servlet')
| -rw-r--r-- | jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java index 6a56ab672f..b5855333a0 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java @@ -739,7 +739,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory r.reset(true); r.setStatus(HttpServletResponse.SC_NOT_MODIFIED); if (_etags) - r.getHttpFields().add(HttpHeaders.ETAG_BUFFER,content.getETag()); + r.getHttpFields().add(HttpHeader.ETAG,content.getETag()); r.flushBuffer(); return false; } @@ -754,7 +754,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory r.reset(true); r.setStatus(HttpServletResponse.SC_NOT_MODIFIED); if (_etags) - r.getHttpFields().add(HttpHeaders.ETAG_BUFFER,content.getETag()); + r.getHttpFields().add(HttpHeader.ETAG,content.getETag()); r.flushBuffer(); return false; } |