commit 4deeefb2d3f26eb2f03b1cf45974a1e5d360dcce
author Shawn Pearce <sop@google.com> Sat May 11 00:48:43 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat May 11 00:48:43 2013 +0000
tree e3fee0025621bdd696571cf63ffa561b7bc2de7c
parent 1d50a4dee77a7734c9918f977de8960fb80e7670
parent a884b9e7f303ec637d9a5e2fffc0335894cfb36a

Merge "Fix warnings about deprecated setStatus(int,String)"

gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java

diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java
index 3d9f4c8..d87e4af 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java
@@ -189,6 +189,7 @@
     }
 
     @Override
+    @Deprecated
     public void setStatus(int sc, String sm) {
       status(sc);
       super.setStatus(sc, sm);

gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java

diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java
index c38425d..f1bddeb 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java
@@ -332,6 +332,7 @@
     }
 
     @Override
+    @Deprecated
     public void setStatus(int sc, String sm) {
       status(sc);
       super.setStatus(sc, sm);

gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/AuditedHttpServletResponse.java

diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/AuditedHttpServletResponse.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/AuditedHttpServletResponse.java
index e874513..c0c4535 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/AuditedHttpServletResponse.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/AuditedHttpServletResponse.java
@@ -39,6 +39,7 @@
   }
 
   @Override
+  @Deprecated
   public void setStatus(int sc, String sm) {
     super.setStatus(sc, sm);
     this.status = sc;