Преглед изворни кода

HDFS-3330. If GetImageServlet throws an Error or RTE, response should not have HTTP "OK" status. Contributed by Todd Lipcon

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1339938 13f79535-47bb-0310-9956-ffa450edef68
Eli Collins пре 13 година
родитељ
комит
3858eb68d5
2 измењених фајлова са 5 додато и 2 уклоњено
  1. 3 0
      CHANGES.txt
  2. 2 2
      src/hdfs/org/apache/hadoop/hdfs/server/namenode/GetImageServlet.java

+ 3 - 0
CHANGES.txt

@@ -234,6 +234,9 @@ Release 1.1.0 - unreleased
     MAPREDUCE-4241. Pipes examples do not compile on Ubuntu 12.04.
     MAPREDUCE-4241. Pipes examples do not compile on Ubuntu 12.04.
     (Andrew Bayer via eli)
     (Andrew Bayer via eli)
 
 
+    HDFS-3330. If GetImageServlet throws an Error or RTE, response should not
+    have HTTP "OK" status. (todd via eli)
+
 Release 1.0.3 - 2012.05.07
 Release 1.0.3 - 2012.05.07
 
 
   NEW FEATURES
   NEW FEATURES

+ 2 - 2
src/hdfs/org/apache/hadoop/hdfs/server/namenode/GetImageServlet.java

@@ -126,8 +126,8 @@ public class GetImageServlet extends HttpServlet {
         }
         }
       });
       });
 
 
-    } catch (Exception ie) {
-      String errMsg = "GetImage failed. " + StringUtils.stringifyException(ie);
+    } catch (Throwable t) {
+      String errMsg = "GetImage failed. " + StringUtils.stringifyException(t);
       response.sendError(HttpServletResponse.SC_GONE, errMsg);
       response.sendError(HttpServletResponse.SC_GONE, errMsg);
       throw new IOException(errMsg);
       throw new IOException(errMsg);
     } finally {
     } finally {