Index: CHANGES.txt
===================================================================
--- CHANGES.txt (revision 1208293)
+++ CHANGES.txt (working copy)
@@ -100,6 +100,7 @@
HBASE-4862 Splitting hlog and opening region concurrently may cause data loss
(Chunhui Shen)
HBASE-4773 HBaseAdmin may leak ZooKeeper connections (Xufeng)
+ HBASE-4900 Fix javadoc warnings out on 0.90 branch
IMPROVEMENT
HBASE-4205 Enhance HTable javadoc (Eric Charles)
Index: src/main/java/org/apache/hadoop/hbase/HConstants.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/HConstants.java (revision 1208293)
+++ src/main/java/org/apache/hadoop/hbase/HConstants.java (working copy)
@@ -405,19 +405,19 @@
public static int DEFAULT_HBASE_META_SCANNER_CACHING = 100;
/**
- * Parameter name for unique identifier for this {@link Configuration}
- * instance. If there are two or more {@link Configuration} instances that,
+ * Parameter name for unique identifier for this Configuration
+ * instance. If there are two or more Configuration instances that,
* for all intents and purposes, are the same except for their instance ids,
- * then they will not be able to share the same {@link Connection} instance.
+ * then they will not be able to share the same HConnection instance.
* On the other hand, even if the instance ids are the same, it could result
- * in non-shared {@link Connection} instances if some of the other connection
+ * in non-shared HConnection instances if some of the other connection
* parameters differ.
*/
public static String HBASE_CLIENT_INSTANCE_ID = "hbase.client.instance.id";
/**
- * If this parameter is set true then {@link HConnectionManager} will not share
- * {@link HConnection} instances with different {@link Configuration} instances.
+ * If this parameter is set true then HConnectionManager will not share
+ * HConnection instances with different Configuration instances.
*/
public static String HBASE_CONNECTION_PER_CONFIG = "hbase.connection.per.config";
Index: src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (revision 1208293)
+++ src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (working copy)
@@ -101,7 +101,7 @@
* begin active tracking by executing {@link #start()} post construction.
* Does not timeout.
* @param zk
- * @param connection server connection
+ * @param conf Configuration instance
* @param abortable if fatal exception
* @throws IOException
*/
@@ -115,7 +115,7 @@
* Constructs the catalog tracker. Find current state of catalog tables and
* begin active tracking by executing {@link #start()} post construction.
* @param zk
- * @param connection server connection
+ * @param conf
* @param abortable if fatal exception
* @param defaultTimeout Timeout to use. Pass zero for no timeout
* ({@link Object#wait(long)} when passed a 0 waits for ever).
Index: src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java (revision 1208293)
+++ src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java (working copy)
@@ -316,9 +316,6 @@
*
* @param region
* region to open
- * @param versionOfOfflineNode
- * the version of znode to compare when RS transitions the znode from
- * OFFLINE state.
* @return RegionOpeningState
* OPENED - if region open request was successful.
* ALREADY_OPENED - if the region was already opened.
Index: src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (revision 1208293)
+++ src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (working copy)
@@ -140,7 +140,6 @@
/**
* Check whether dfs is in safemode.
* @param conf
- * @return true if dfs is in safemode.
* @throws IOException
*/
public static void checkDfsSafeMode(final Configuration conf)
Index: src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (revision 1208293)
+++ src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (working copy)
@@ -278,7 +278,7 @@
* of a {@link HConnection} instance based on the given {@link Configuration}.
*
*
- * If you find yourself wanting to use a {@link Connection} for a relatively + * If you find yourself wanting to use a {@link HConnection} for a relatively * short duration of time, and do not want to deal with the hassle of creating * and cleaning up that resource, then you should consider using this * convenience class.