You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/02/17 18:36:16 UTC

[12/18] hbase-site git commit: Published site at 9f8273e7175954cf6dd4bf523b531bf9971749bb.

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html b/testdevapidocs/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
index 037b17c..d5be6a0 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
@@ -95,7 +95,7 @@
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.68">TestFlushSnapshotFromClient</a>
+<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.70">TestFlushSnapshotFromClient</a>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">Test creating/using/deleting snapshots from the client
  <p>
@@ -122,25 +122,33 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>protected org.apache.hadoop.hbase.client.Admin</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#admin">admin</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>protected int</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#DEFAULT_NUM_ROWS">DEFAULT_NUM_ROWS</a></strong></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private static org.apache.commons.logging.Log</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#LOG">LOG</a></strong></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected static int</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#NUM_RS">NUM_RS</a></strong></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected static org.apache.hadoop.hbase.TableName</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#TABLE_NAME">TABLE_NAME</a></strong></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>protected static byte[]</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#TEST_FAM">TEST_FAM</a></strong></code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>org.junit.rules.TestRule</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#timeout">timeout</a></strong></code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>protected static <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#UTIL">UTIL</a></strong></code>&nbsp;</td>
@@ -292,7 +300,16 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>LOG</h4>
-<pre>private static final&nbsp;org.apache.commons.logging.Log <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.69">LOG</a></pre>
+<pre>private static final&nbsp;org.apache.commons.logging.Log <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.71">LOG</a></pre>
+</li>
+</ul>
+<a name="timeout">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>timeout</h4>
+<pre>public final&nbsp;org.junit.rules.TestRule <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.72">timeout</a></pre>
 </li>
 </ul>
 <a name="UTIL">
@@ -301,7 +318,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>UTIL</h4>
-<pre>protected static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.71">UTIL</a></pre>
+<pre>protected static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.75">UTIL</a></pre>
 </li>
 </ul>
 <a name="NUM_RS">
@@ -310,7 +327,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>NUM_RS</h4>
-<pre>protected static final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.72">NUM_RS</a></pre>
+<pre>protected static final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.76">NUM_RS</a></pre>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.snapshot.TestFlushSnapshotFromClient.NUM_RS">Constant Field Values</a></dd></dl>
 </li>
 </ul>
@@ -320,7 +337,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>TEST_FAM</h4>
-<pre>protected static final&nbsp;byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.73">TEST_FAM</a></pre>
+<pre>protected static final&nbsp;byte[] <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.77">TEST_FAM</a></pre>
 </li>
 </ul>
 <a name="TABLE_NAME">
@@ -329,19 +346,28 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>TABLE_NAME</h4>
-<pre>protected static final&nbsp;org.apache.hadoop.hbase.TableName <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.74">TABLE_NAME</a></pre>
+<pre>protected static final&nbsp;org.apache.hadoop.hbase.TableName <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.78">TABLE_NAME</a></pre>
 </li>
 </ul>
 <a name="DEFAULT_NUM_ROWS">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_NUM_ROWS</h4>
-<pre>protected final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.75">DEFAULT_NUM_ROWS</a></pre>
+<pre>protected final&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.79">DEFAULT_NUM_ROWS</a></pre>
 <dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.snapshot.TestFlushSnapshotFromClient.DEFAULT_NUM_ROWS">Constant Field Values</a></dd></dl>
 </li>
 </ul>
+<a name="admin">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>admin</h4>
+<pre>protected&nbsp;org.apache.hadoop.hbase.client.Admin <a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.80">admin</a></pre>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
@@ -356,7 +382,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TestFlushSnapshotFromClient</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.68">TestFlushSnapshotFromClient</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.70">TestFlushSnapshotFromClient</a>()</pre>
 </li>
 </ul>
 </li>
@@ -373,7 +399,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setupCluster</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.78">setupCluster</a>()
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.83">setupCluster</a>()
                          throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -385,7 +411,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setupConf</h4>
-<pre>protected static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.83">setupConf</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>protected static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.88">setupConf</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
 </ul>
 <a name="setup()">
@@ -394,7 +420,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setup</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.101">setup</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.106">setup</a>()
            throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -406,7 +432,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>createTable</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.105">createTable</a>()
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.111">createTable</a>()
                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -418,7 +444,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>tearDown</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.110">tearDown</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.116">tearDown</a>()
               throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -430,7 +456,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>cleanupTest</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.118">cleanupTest</a>()
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.124">cleanupTest</a>()
                         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -442,7 +468,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>testFlushTableSnapshot</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.131">testFlushTableSnapshot</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.137">testFlushTableSnapshot</a>()
                             throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Test simple flush snapshotting a table that is online</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -455,7 +481,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>testSkipFlushTableSnapshot</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.164">testSkipFlushTableSnapshot</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.169">testSkipFlushTableSnapshot</a>()
                                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Test snapshotting a table that is online without flushing</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -468,7 +494,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>testFlushTableSnapshotWithProcedure</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.204">testFlushTableSnapshotWithProcedure</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.208">testFlushTableSnapshotWithProcedure</a>()
                                          throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Test simple flush snapshotting a table that is online</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -481,7 +507,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>testSnapshotFailsOnNonExistantTable</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.238">testSnapshotFailsOnNonExistantTable</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.241">testSnapshotFailsOnNonExistantTable</a>()
                                          throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -493,7 +519,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>testAsyncFlushSnapshot</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.267">testAsyncFlushSnapshot</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.269">testAsyncFlushSnapshot</a>()
                             throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -505,7 +531,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>testSnapshotStateAfterMerge</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.288">testSnapshotStateAfterMerge</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.289">testSnapshotStateAfterMerge</a>()
                                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -529,7 +555,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>testFlushCreateListDestroy</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.386">testFlushCreateListDestroy</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.385">testFlushCreateListDestroy</a>()
                                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Basic end-to-end test of simple-flush-based snapshots</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -542,7 +568,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>testConcurrentSnapshottingAttempts</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.407">testConcurrentSnapshottingAttempts</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.405">testConcurrentSnapshottingAttempts</a>()
                                         throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
                                                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
 <div class="block">Demonstrate that we reject snapshot requests if there is a snapshot already running on the
@@ -559,7 +585,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>waitRegionsAfterMerge</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.506">waitRegionsAfterMerge</a>(long&nbsp;numRegionsAfterMerge)
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.502">waitRegionsAfterMerge</a>(long&nbsp;numRegionsAfterMerge)
                             throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
                                    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -573,7 +599,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>verifyRowCount</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.522">verifyRowCount</a>(<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a>&nbsp;util,
+<pre>protected&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.517">verifyRowCount</a>(<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a>&nbsp;util,
                   org.apache.hadoop.hbase.TableName&nbsp;tableName,
                   long&nbsp;expectedRows)
                        throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -587,7 +613,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>countRows</h4>
-<pre>protected&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.527">countRows</a>(org.apache.hadoop.hbase.client.Table&nbsp;table,
+<pre>protected&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html#line.522">countRows</a>(org.apache.hadoop.hbase.client.Table&nbsp;table,
             byte[]...&nbsp;families)
                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
index a009e7c..caa0d78 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html
@@ -38,135 +38,140 @@
 <span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.30"></a>
 <span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import org.junit.Assert;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.junit.Test;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.junit.experimental.categories.Category;<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>/**<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * This tests whether ServerSocketChannel works over ipv6, which Zookeeper<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * depends on. On Windows Oracle JDK 6, creating a ServerSocketChannel throws<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * java.net.SocketException: Address family not supported by protocol family<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * exception. It is a known JVM bug, seems to be only resolved for JDK7:<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * http://bugs.sun.com/view_bug.do?bug_id=6230761<a name="line.41"></a>
-<span class="sourceLineNo">042</span> *<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * For this test, we check that whether we are effected by this bug, and if so<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * the test ensures that we are running with java.net.preferIPv4Stack=true, so<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * that ZK will not fail to bind to ipv6 address using ClientCnxnSocketNIO.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>@Category({MiscTests.class, SmallTests.class})<a name="line.47"></a>
-<span class="sourceLineNo">048</span>public class TestIPv6NIOServerSocketChannel {<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>  private static final Log LOG = LogFactory.getLog(TestIPv6NIOServerSocketChannel.class);<a name="line.50"></a>
+<span class="sourceLineNo">033</span>import org.junit.Rule;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.junit.Test;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.junit.experimental.categories.Category;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.junit.rules.TestRule;<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>/**<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * This tests whether ServerSocketChannel works over ipv6, which Zookeeper<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * depends on. On Windows Oracle JDK 6, creating a ServerSocketChannel throws<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * java.net.SocketException: Address family not supported by protocol family<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * exception. It is a known JVM bug, seems to be only resolved for JDK7:<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * http://bugs.sun.com/view_bug.do?bug_id=6230761<a name="line.43"></a>
+<span class="sourceLineNo">044</span> *<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * For this test, we check that whether we are effected by this bug, and if so<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * the test ensures that we are running with java.net.preferIPv4Stack=true, so<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * that ZK will not fail to bind to ipv6 address using ClientCnxnSocketNIO.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> */<a name="line.48"></a>
+<span class="sourceLineNo">049</span>@Category({MiscTests.class, SmallTests.class})<a name="line.49"></a>
+<span class="sourceLineNo">050</span>public class TestIPv6NIOServerSocketChannel {<a name="line.50"></a>
 <span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>  /**<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   * Creates and binds a regular ServerSocket.<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   */<a name="line.54"></a>
-<span class="sourceLineNo">055</span>  private void bindServerSocket(InetAddress inetAddr) throws IOException {<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    while(true) {<a name="line.56"></a>
-<span class="sourceLineNo">057</span>      int port = HBaseTestingUtility.randomFreePort();<a name="line.57"></a>
-<span class="sourceLineNo">058</span>      InetSocketAddress addr = new InetSocketAddress(inetAddr, port);<a name="line.58"></a>
-<span class="sourceLineNo">059</span>      ServerSocket serverSocket = null;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      try {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>        serverSocket = new ServerSocket();<a name="line.61"></a>
-<span class="sourceLineNo">062</span>        serverSocket.bind(addr);<a name="line.62"></a>
-<span class="sourceLineNo">063</span>        break;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>      } catch (BindException ex) {<a name="line.64"></a>
-<span class="sourceLineNo">065</span>        //continue<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      } finally {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>        if (serverSocket != null) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span>          serverSocket.close();<a name="line.68"></a>
-<span class="sourceLineNo">069</span>        }<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      }<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    }<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>  /**<a name="line.74"></a>
-<span class="sourceLineNo">075</span>   * Creates a NIO ServerSocketChannel, and gets the ServerSocket from<a name="line.75"></a>
-<span class="sourceLineNo">076</span>   * there. Then binds the obtained socket.<a name="line.76"></a>
-<span class="sourceLineNo">077</span>   * This fails on Windows with Oracle JDK1.6.0u33, if the passed InetAddress is a<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   * IPv6 address. Works on Oracle JDK 1.7.<a name="line.78"></a>
-<span class="sourceLineNo">079</span>   */<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  private void bindNIOServerSocket(InetAddress inetAddr) throws IOException {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    while (true) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>      int port = HBaseTestingUtility.randomFreePort();<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      InetSocketAddress addr = new InetSocketAddress(inetAddr, port);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      ServerSocketChannel channel = null;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      ServerSocket serverSocket = null;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      try {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>        channel = ServerSocketChannel.open();<a name="line.87"></a>
-<span class="sourceLineNo">088</span>        serverSocket = channel.socket();<a name="line.88"></a>
-<span class="sourceLineNo">089</span>        serverSocket.bind(addr); // This does not work<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        break;<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      } catch (BindException ex) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>        //continue<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      } finally {<a name="line.93"></a>
-<span class="sourceLineNo">094</span>        if (serverSocket != null) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>          serverSocket.close();<a name="line.95"></a>
-<span class="sourceLineNo">096</span>        }<a name="line.96"></a>
-<span class="sourceLineNo">097</span>        if (channel != null) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>          channel.close();<a name="line.98"></a>
-<span class="sourceLineNo">099</span>        }<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      }  <a name="line.100"></a>
-<span class="sourceLineNo">101</span>    }<a name="line.101"></a>
-<span class="sourceLineNo">102</span>  }<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span>  /**<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   * Checks whether we are effected by the JDK issue on windows, and if so<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   * ensures that we are running with preferIPv4Stack=true.<a name="line.106"></a>
-<span class="sourceLineNo">107</span>   */<a name="line.107"></a>
-<span class="sourceLineNo">108</span>  @Test<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  public void testServerSocket() throws IOException {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    byte[] addr = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    InetAddress inetAddr = InetAddress.getByAddress(addr);<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>    try {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      bindServerSocket(inetAddr);<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      bindNIOServerSocket(inetAddr);<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      //if on *nix or windows JDK7, both will pass<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    } catch(java.net.SocketException ex) {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      //On Windows JDK6, we will get expected exception:<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      //java.net.SocketException: Address family not supported by protocol family<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      //or java.net.SocketException: Protocol family not supported<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      Assert.assertFalse(ex.getClass().isInstance(BindException.class));<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      Assert.assertTrue(ex.getMessage().toLowerCase().contains("protocol family"));<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      LOG.info("Received expected exception:");<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      LOG.info(ex);<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>      //if this is the case, ensure that we are running on preferIPv4=true<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      ensurePreferIPv4();<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
-<span class="sourceLineNo">129</span>  }<a name="line.129"></a>
+<span class="sourceLineNo">052</span>  private static final Log LOG = LogFactory.getLog(TestIPv6NIOServerSocketChannel.class);<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>  @Rule<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  public final TestRule timeout = CategoryBasedTimeout.builder().<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    withTimeout(this.getClass()).withLookingForStuckThread(true).build();<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  /**<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   * Creates and binds a regular ServerSocket.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>   */<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  private void bindServerSocket(InetAddress inetAddr) throws IOException {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    while(true) {<a name="line.61"></a>
+<span class="sourceLineNo">062</span>      int port = HBaseTestingUtility.randomFreePort();<a name="line.62"></a>
+<span class="sourceLineNo">063</span>      InetSocketAddress addr = new InetSocketAddress(inetAddr, port);<a name="line.63"></a>
+<span class="sourceLineNo">064</span>      ServerSocket serverSocket = null;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>      try {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>        serverSocket = new ServerSocket();<a name="line.66"></a>
+<span class="sourceLineNo">067</span>        serverSocket.bind(addr);<a name="line.67"></a>
+<span class="sourceLineNo">068</span>        break;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      } catch (BindException ex) {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>        //continue<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      } finally {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>        if (serverSocket != null) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>          serverSocket.close();<a name="line.73"></a>
+<span class="sourceLineNo">074</span>        }<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      }<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    }<a name="line.76"></a>
+<span class="sourceLineNo">077</span>  }<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>  /**<a name="line.79"></a>
+<span class="sourceLineNo">080</span>   * Creates a NIO ServerSocketChannel, and gets the ServerSocket from<a name="line.80"></a>
+<span class="sourceLineNo">081</span>   * there. Then binds the obtained socket.<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   * This fails on Windows with Oracle JDK1.6.0u33, if the passed InetAddress is a<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * IPv6 address. Works on Oracle JDK 1.7.<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   */<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  private void bindNIOServerSocket(InetAddress inetAddr) throws IOException {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    while (true) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      int port = HBaseTestingUtility.randomFreePort();<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      InetSocketAddress addr = new InetSocketAddress(inetAddr, port);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      ServerSocketChannel channel = null;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      ServerSocket serverSocket = null;<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      try {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>        channel = ServerSocketChannel.open();<a name="line.92"></a>
+<span class="sourceLineNo">093</span>        serverSocket = channel.socket();<a name="line.93"></a>
+<span class="sourceLineNo">094</span>        serverSocket.bind(addr); // This does not work<a name="line.94"></a>
+<span class="sourceLineNo">095</span>        break;<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      } catch (BindException ex) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>        //continue<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      } finally {<a name="line.98"></a>
+<span class="sourceLineNo">099</span>        if (serverSocket != null) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>          serverSocket.close();<a name="line.100"></a>
+<span class="sourceLineNo">101</span>        }<a name="line.101"></a>
+<span class="sourceLineNo">102</span>        if (channel != null) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>          channel.close();<a name="line.103"></a>
+<span class="sourceLineNo">104</span>        }<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      }  <a name="line.105"></a>
+<span class="sourceLineNo">106</span>    }<a name="line.106"></a>
+<span class="sourceLineNo">107</span>  }<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span>  /**<a name="line.109"></a>
+<span class="sourceLineNo">110</span>   * Checks whether we are effected by the JDK issue on windows, and if so<a name="line.110"></a>
+<span class="sourceLineNo">111</span>   * ensures that we are running with preferIPv4Stack=true.<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   */<a name="line.112"></a>
+<span class="sourceLineNo">113</span>  @Test<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  public void testServerSocket() throws IOException {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    byte[] addr = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    InetAddress inetAddr = InetAddress.getByAddress(addr);<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span>    try {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      bindServerSocket(inetAddr);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      bindNIOServerSocket(inetAddr);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      //if on *nix or windows JDK7, both will pass<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    } catch(java.net.SocketException ex) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      //On Windows JDK6, we will get expected exception:<a name="line.123"></a>
+<span class="sourceLineNo">124</span>      //java.net.SocketException: Address family not supported by protocol family<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      //or java.net.SocketException: Protocol family not supported<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      Assert.assertFalse(ex.getClass().isInstance(BindException.class));<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      Assert.assertTrue(ex.getMessage().toLowerCase().contains("protocol family"));<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      LOG.info("Received expected exception:");<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      LOG.info(ex);<a name="line.129"></a>
 <span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>  /**<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   * Checks whether we are running with java.net.preferIPv4Stack=true<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   */<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  public void ensurePreferIPv4() throws IOException {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    InetAddress[] addrs = InetAddress.getAllByName("localhost");<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    for (InetAddress addr : addrs) {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      LOG.info("resolved localhost as:" + addr);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      Assert.assertEquals(4, addr.getAddress().length); //ensure 4 byte ipv4 address<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  /**<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   * Tests whether every InetAddress we obtain by resolving can open a<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   * ServerSocketChannel.<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   */<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  @Test<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  public void testServerSocketFromLocalhostResolution() throws IOException {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    InetAddress[] addrs = InetAddress.getAllByName("localhost");<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    for (InetAddress addr : addrs) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      LOG.info("resolved localhost as:" + addr);<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      bindServerSocket(addr);<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      bindNIOServerSocket(addr);<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
-<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span>  public static void main(String[] args) throws Exception {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    TestIPv6NIOServerSocketChannel test = new TestIPv6NIOServerSocketChannel();<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    test.testServerSocket();<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    test.testServerSocketFromLocalhostResolution();<a name="line.159"></a>
-<span class="sourceLineNo">160</span>  }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>}<a name="line.161"></a>
+<span class="sourceLineNo">131</span>      //if this is the case, ensure that we are running on preferIPv4=true<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      ensurePreferIPv4();<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>  }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>  /**<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   * Checks whether we are running with java.net.preferIPv4Stack=true<a name="line.137"></a>
+<span class="sourceLineNo">138</span>   */<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  public void ensurePreferIPv4() throws IOException {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    InetAddress[] addrs = InetAddress.getAllByName("localhost");<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    for (InetAddress addr : addrs) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      LOG.info("resolved localhost as:" + addr);<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      Assert.assertEquals(4, addr.getAddress().length); //ensure 4 byte ipv4 address<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    }<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  }<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>  /**<a name="line.147"></a>
+<span class="sourceLineNo">148</span>   * Tests whether every InetAddress we obtain by resolving can open a<a name="line.148"></a>
+<span class="sourceLineNo">149</span>   * ServerSocketChannel.<a name="line.149"></a>
+<span class="sourceLineNo">150</span>   */<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  @Test<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  public void testServerSocketFromLocalhostResolution() throws IOException {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    InetAddress[] addrs = InetAddress.getAllByName("localhost");<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    for (InetAddress addr : addrs) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      LOG.info("resolved localhost as:" + addr);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      bindServerSocket(addr);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      bindNIOServerSocket(addr);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    }<a name="line.158"></a>
+<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>  public static void main(String[] args) throws Exception {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    TestIPv6NIOServerSocketChannel test = new TestIPv6NIOServerSocketChannel();<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    test.testServerSocket();<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    test.testServerSocketFromLocalhostResolution();<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
+<span class="sourceLineNo">166</span>}<a name="line.166"></a>