From 8f3946cd4013eaeaafbaf7d038f3920f74c8457e Mon Sep 17 00:00:00 2001 From: Xiaoyu Yao Date: Sat, 25 Apr 2015 21:41:35 -0700 Subject: [PATCH] HDFS-8206. Fix the typos in hadoop-hdfs-httpfs. (Brahma Reddy Battula via xyao) --- .../org/apache/hadoop/fs/http/client/HttpFSFileSystem.java | 6 +++--- .../hadoop/fs/http/server/CheckUploadContentTypeFilter.java | 4 ++-- .../java/org/apache/hadoop/fs/http/server/HttpFSServer.java | 2 +- .../apache/hadoop/lib/servlet/FileSystemReleaseFilter.java | 4 ++-- .../java/org/apache/hadoop/lib/servlet/HostnameFilter.java | 4 ++-- .../main/java/org/apache/hadoop/lib/servlet/MDCFilter.java | 4 ++-- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java index e797d1207d..3a6ce7dc9e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java @@ -238,7 +238,7 @@ public String getMethod() { * @return a HttpURLConnection for the HttpFSServer server, * authenticated and ready to use for the specified path and file system operation. * - * @throws IOException thrown if an IO error occurrs. + * @throws IOException thrown if an IO error occurs. */ private HttpURLConnection getConnection(final String method, Map params, Path path, boolean makeQualified) @@ -263,7 +263,7 @@ private HttpURLConnection getConnection(final String method, * HttpFSServer server, authenticated and ready to use for the * specified path and file system operation. * - * @throws IOException thrown if an IO error occurrs. + * @throws IOException thrown if an IO error occurs. */ private HttpURLConnection getConnection(final String method, Map params, Map> multiValuedParams, @@ -301,7 +301,7 @@ public HttpURLConnection run() throws Exception { * @return a HttpURLConnection for the HttpFSServer server, authenticated and ready to use for * the specified path and file system operation. * - * @throws IOException thrown if an IO error occurrs. + * @throws IOException thrown if an IO error occurs. */ private HttpURLConnection getConnection(URL url, String method) throws IOException { try { diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java index 81b0b7a2b7..e96bfa1378 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java @@ -70,8 +70,8 @@ public void init(FilterConfig config) throws ServletException { * @param response servlet response. * @param chain filter chain. * - * @throws IOException thrown if an IO error occurrs. - * @throws ServletException thrown if a servet error occurrs. + * @throws IOException thrown if an IO error occurs. + * @throws ServletException thrown if a servlet error occurs. */ @Override public void doFilter(ServletRequest request, ServletResponse response, diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java index 1f903ba154..b7b63fabdc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java @@ -104,7 +104,7 @@ public class HttpFSServer { * * @return FileSystemExecutor response * - * @throws IOException thrown if an IO error occurrs. + * @throws IOException thrown if an IO error occurs. * @throws FileSystemAccessException thrown if a FileSystemAccess releated error occurred. Thrown * exceptions are handled by {@link HttpFSExceptionProvider}. */ diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/FileSystemReleaseFilter.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/FileSystemReleaseFilter.java index cf73979f64..ec559f9125 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/FileSystemReleaseFilter.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/FileSystemReleaseFilter.java @@ -64,8 +64,8 @@ public void init(FilterConfig filterConfig) throws ServletException { * @param servletResponse servlet response. * @param filterChain filter chain. * - * @throws IOException thrown if an IO error occurrs. - * @throws ServletException thrown if a servet error occurrs. + * @throws IOException thrown if an IO error occurs. + * @throws ServletException thrown if a servlet error occurs. */ @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/HostnameFilter.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/HostnameFilter.java index 64f4926f5a..ed116e6bb0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/HostnameFilter.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/HostnameFilter.java @@ -63,8 +63,8 @@ public void init(FilterConfig config) throws ServletException { * @param response servlet response. * @param chain filter chain. * - * @throws IOException thrown if an IO error occurrs. - * @throws ServletException thrown if a servet error occurrs. + * @throws IOException thrown if an IO error occurs. + * @throws ServletException thrown if a servlet error occurs. */ @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/MDCFilter.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/MDCFilter.java index 156cf64ab0..0f34652d18 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/MDCFilter.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/MDCFilter.java @@ -66,8 +66,8 @@ public void init(FilterConfig config) throws ServletException { * @param response servlet response. * @param chain filter chain. * - * @throws IOException thrown if an IO error occurrs. - * @throws ServletException thrown if a servet error occurrs. + * @throws IOException thrown if an IO error occurs. + * @throws ServletException thrown if a servlet error occurs. */ @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index c1aac54543..a0a81c0282 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -321,6 +321,8 @@ Trunk (Unreleased) HDFS-7673. synthetic load generator docs give incorrect/incomplete commands (Brahma Reddy Battula via aw) + HDFS-8206. Fix the typos in hadoop-hdfs-httpfs. (Brahma Reddy Battula via xyao) + Release 2.8.0 - UNRELEASED INCOMPATIBLE CHANGES