Author: suresh
Date: Tue Dec 17 18:24:38 2013
New Revision: 1551648
URL: http://svn.apache.org/r1551648
Log:
HADOOP-10168. Merge 1551646 from trunk.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ReflectionUtils.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1551648&r1=1551647&r2=1551648&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Dec 17 18:24:38 2013
@@ -105,12 +105,14 @@ Release 2.4.0 - UNRELEASED
HADOOP-10102. Update commons IO from 2.1 to 2.4 (Akira Ajisaka via stevel)
+ HADOOP-10168. fix javadoc of ReflectionUtils#copy. (Thejas Nair via suresh)
+
OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
- HADOOP-10047. Add a direct-buffer based apis for compression. (Gopal V
- via acmurthy)
+ HADOOP-10047. Add a direct-buffer based apis for compression. (Gopal V
+ via acmurthy)
BUG FIXES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ReflectionUtils.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ReflectionUtils.java?rev=1551648&r1=1551647&r2=1551648&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ReflectionUtils.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ReflectionUtils.java
Tue Dec 17 18:24:38 2013
@@ -275,8 +275,9 @@ public class ReflectionUtils {
/**
* Make a copy of the writable object using serialization to a buffer
- * @param dst the object to copy from
- * @param src the object to copy into, which is destroyed
+ * @param src the object to copy from
+ * @param dst the object to copy into, which is destroyed
+ * @return dst param (the copy)
* @throws IOException
*/
@SuppressWarnings("unchecked")
