diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/AuthenticationException.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/AuthenticationException.java index 13632fb1bc..cb99c88112 100644 --- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/AuthenticationException.java +++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/AuthenticationException.java @@ -14,7 +14,7 @@ package org.apache.hadoop.security.authentication.client; /** - * Exception thrown when an authentication error occurrs. + * Exception thrown when an authentication error occurs. */ public class AuthenticationException extends Exception { diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/PseudoAuthenticator.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/PseudoAuthenticator.java index 46d94b88de..29ca9cf93e 100644 --- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/PseudoAuthenticator.java +++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/PseudoAuthenticator.java @@ -57,7 +57,7 @@ public void setConnectionConfigurator(ConnectionConfigurator configurator) { * If the response is successful it will update the authentication token. * * @param url the URl to authenticate against. - * @param token the authencation token being used for the user. + * @param token the authentication token being used for the user. * * @throws IOException if an IO error occurred. * @throws AuthenticationException if an authentication error occurred. diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 1234ea08a5..3c636ecd4c 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -198,6 +198,9 @@ Trunk (Unreleased) HADOOP-11781. fix race conditions and add URL support to smart-apply-patch.sh (Raymie Stata via aw) + HADOOP-11850. Typos in hadoop-common java docs. (Surendra Singh Lilhore + via jghoman) + BUG FIXES HADOOP-11473. test-patch says "-1 overall" even when all checks are +1 diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/BufferedFSInputStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/BufferedFSInputStream.java index 4855e0c3d2..2eb8b959b2 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/BufferedFSInputStream.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/BufferedFSInputStream.java @@ -27,7 +27,7 @@ /** - * A class optimizes reading from FSInputStream by bufferring + * A class that optimizes reading from FSInputStream by buffering */ @InterfaceAudience.Private diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java index dddf0ce815..3b8ecea5a9 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java @@ -662,7 +662,7 @@ public void completeLocalOutput(Path fsOutputFile, Path tmpLocalFile) * @param inPos the position of the beginning of the bad data in the file * @param sums the stream open on the checksum file * @param sumsPos the position of the beginning of the bad data in the checksum file - * @return if retry is neccessary + * @return if retry is necessary */ public boolean reportChecksumFailure(Path f, FSDataInputStream in, long inPos, FSDataInputStream sums, long sumsPos) { diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFs.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFs.java index 7dc4a809cd..ba0f1dd367 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFs.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFs.java @@ -507,7 +507,7 @@ public boolean delete(Path f, boolean recursive) * @param sums the stream open on the checksum file * @param sumsPos the position of the beginning of the bad data in the * checksum file - * @return if retry is neccessary + * @return if retry is necessary */ public boolean reportChecksumFailure(Path f, FSDataInputStream in, long inPos, FSDataInputStream sums, long sumsPos) { diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ContentSummary.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ContentSummary.java index ccd6960dd0..678ce7f37d 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ContentSummary.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ContentSummary.java @@ -175,7 +175,7 @@ private ContentSummary( /** Return the directory quota */ public long getQuota() {return quota;} - /** Retuns storage space consumed */ + /** Returns storage space consumed */ public long getSpaceConsumed() {return spaceConsumed;} /** Returns storage space quota */ diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputChecker.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputChecker.java index a88938e6f3..889ccc1486 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputChecker.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputChecker.java @@ -112,7 +112,7 @@ protected FSInputChecker( Path file, int numOfRetries, * for sequential reading. * * @param pos chunkPos - * @param buf desitination buffer + * @param buf destination buffer * @param offset offset in buf at which to store data * @param len maximum number of bytes to read * @param checksum the data buffer into which to write checksums @@ -123,7 +123,7 @@ abstract protected int readChunk(long pos, byte[] buf, int offset, int len, /** Return position of beginning of chunk containing pos. * - * @param pos a postion in the file + * @param pos a position in the file * @return the starting position of the chunk which contains the byte */ abstract protected long getChunkPosition(long pos); @@ -388,7 +388,7 @@ public synchronized long skip(long n) throws IOException { * This produces no exception and an attempt to read from * the stream will result in -1 indicating the end of the file. * - * @param pos the postion to seek to. + * @param pos the position to seek to. * @exception IOException if an I/O error occurs. * ChecksumException if the chunk to seek to is corrupted */ @@ -423,7 +423,7 @@ public synchronized void seek(long pos) throws IOException { * stm * * @param stm an input stream - * @param buf destiniation buffer + * @param buf destination buffer * @param offset offset at which to store data * @param len number of bytes to read * @return actual number of bytes read diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java index d2998b6e9d..bdc55853d8 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java @@ -92,7 +92,7 @@ public synchronized void write(int b) throws IOException { * in a checksum chunk are in the buffer. If the buffer is empty and * requested length is at least as large as the size of next checksum chunk * size, this method will checksum and write the chunk directly - * to the underlying output stream. Thus it avoids uneccessary data copy. + * to the underlying output stream. Thus it avoids unnecessary data copy. * * @param b the data. * @param off the start offset in the data. diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java index aad8be9e2c..0b5863b976 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java @@ -342,7 +342,7 @@ public AbstractFileSystem run() throws UnsupportedFileSystemException { * * @param defFS * @param aConf - * @return new FileContext with specifed FS as default. + * @return new FileContext with specified FS as default. */ public static FileContext getFileContext(final AbstractFileSystem defFS, final Configuration aConf) { @@ -612,7 +612,7 @@ public Path makeQualified(final Path path) { * @param opts file creation options; see {@link Options.CreateOpts}. *