Regeneration from plexi 0fd57ed
diff --git a/coverage/com.google.enterprise.adaptor.AbortImmediatelyFilter.html b/coverage/com.google.enterprise.adaptor.AbortImmediatelyFilter.html
index ef33afe..94e4e4c 100644
--- a/coverage/com.google.enterprise.adaptor.AbortImmediatelyFilter.html
+++ b/coverage/com.google.enterprise.adaptor.AbortImmediatelyFilter.html
@@ -61,7 +61,7 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 22</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/** Filter that aborts the request when server is under high load. */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 23</td> <td class="nbHitsCovered"> 46</td> <td class="src"><pre class="src"> <span class="keyword">class</span> AbortImmediatelyFilter <span class="keyword">extends</span> Filter {</pre></td></tr>
+<tr> <td class="numLineCover"> 23</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> <span class="keyword">class</span> AbortImmediatelyFilter <span class="keyword">extends</span> Filter {</pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
@@ -79,13 +79,13 @@
<td class="src"><pre class="src"> <span class="comment">// Checking abortImmediately is part of a hack to immediately reject clients</span></pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// when the work queue grows too long.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 33</td> <td class="nbHitsCovered"><a title="Line 33: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 33: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (HttpExchanges.abortImmediately.get() != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 33</td> <td class="nbHitsCovered"><a title="Line 33: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 33: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (HttpExchanges.abortImmediately.get() != <span class="keyword">null</span>) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 34</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IOException(</pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"Aborting request because server is under high load"</span>);</pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 37</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> chain.doFilter(ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 37</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> chain.doFilter(ex);</pre></td></tr>
<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
diff --git a/coverage/com.google.enterprise.adaptor.AbstractAdaptor.html b/coverage/com.google.enterprise.adaptor.AbstractAdaptor.html
index 28094f5..2c5dd75 100644
--- a/coverage/com.google.enterprise.adaptor.AbstractAdaptor.html
+++ b/coverage/com.google.enterprise.adaptor.AbstractAdaptor.html
@@ -63,7 +63,7 @@
<td class="src"><pre class="src"> <span class="comment"> * and {@link Adaptor#getDocContent}.</span></pre></td></tr>
<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 24</td> <td class="nbHitsCovered"> 343</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">abstract</span> <span class="keyword">class</span> AbstractAdaptor <span class="keyword">implements</span> Adaptor {</pre></td></tr>
+<tr> <td class="numLineCover"> 24</td> <td class="nbHitsCovered"> 346</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">abstract</span> <span class="keyword">class</span> AbstractAdaptor <span class="keyword">implements</span> Adaptor {</pre></td></tr>
<tr> <td class="numLineCover"> 25</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger log</pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> = Logger.getLogger(AbstractAdaptor.<span class="keyword">class</span>.getName());</pre></td></tr>
diff --git a/coverage/com.google.enterprise.adaptor.AbstractDocIdPusher.html b/coverage/com.google.enterprise.adaptor.AbstractDocIdPusher.html
index b1a3154..dfd2a6b 100644
--- a/coverage/com.google.enterprise.adaptor.AbstractDocIdPusher.html
+++ b/coverage/com.google.enterprise.adaptor.AbstractDocIdPusher.html
@@ -65,7 +65,7 @@
<td class="src"><pre class="src"> <span class="comment"> * Abstract class providing most methods required for a {@code DocIdPusher}.</span></pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 25</td> <td class="nbHitsCovered"> 51</td> <td class="src"><pre class="src"> <span class="keyword">abstract</span> <span class="keyword">class</span> AbstractDocIdPusher <span class="keyword">implements</span> DocIdPusher {</pre></td></tr>
+<tr> <td class="numLineCover"> 25</td> <td class="nbHitsCovered"> 53</td> <td class="src"><pre class="src"> <span class="keyword">abstract</span> <span class="keyword">class</span> AbstractDocIdPusher <span class="keyword">implements</span> DocIdPusher {</pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.Acl.html b/coverage/com.google.enterprise.adaptor.Acl.html
index 78c539e..9531e16 100644
--- a/coverage/com.google.enterprise.adaptor.Acl.html
+++ b/coverage/com.google.enterprise.adaptor.Acl.html
@@ -876,12 +876,12 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 499</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object o) {</pre></td></tr>
-<tr> <td class="numLineCover"> 500</td> <td class="nbHitsCovered"><a title="Line 500: Conditional coverage 100% (2/2)."> 61</a></td> <td class="src"><pre class="src"> <a title="Line 500: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!(o <span class="keyword">instanceof</span> Acl)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 500</td> <td class="nbHitsCovered"><a title="Line 500: Conditional coverage 100% (2/2)."> 62</a></td> <td class="src"><pre class="src"> <a title="Line 500: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!(o <span class="keyword">instanceof</span> Acl)) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 501</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 502</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 503</td> <td class="nbHitsCovered"><a title="Line 503: Conditional coverage 100% (2/2)."> 60</a></td> <td class="src"><pre class="src"> <a title="Line 503: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">this</span> == o) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 504</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 503</td> <td class="nbHitsCovered"><a title="Line 503: Conditional coverage 100% (2/2)."> 61</a></td> <td class="src"><pre class="src"> <a title="Line 503: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">this</span> == o) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 504</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 505</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLineCover"> 506</td> <td class="nbHitsCovered"> 54</td> <td class="src"><pre class="src"> Acl a = (Acl) o;</pre></td></tr>
diff --git a/coverage/com.google.enterprise.adaptor.AclTransform.html b/coverage/com.google.enterprise.adaptor.AclTransform.html
index e6d4bea..abb4895 100644
--- a/coverage/com.google.enterprise.adaptor.AclTransform.html
+++ b/coverage/com.google.enterprise.adaptor.AclTransform.html
@@ -81,9 +81,9 @@
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> List<Rule> rules;</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 32</td> <td class="nbHitsCovered"> 198</td> <td class="src"><pre class="src"> <span class="keyword">public</span> AclTransform(List<Rule> rules) {</pre></td></tr>
-<tr> <td class="numLineCover"> 33</td> <td class="nbHitsCovered"> 198</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.rules = Collections.unmodifiableList(<span class="keyword">new</span> ArrayList<Rule>(rules));</pre></td></tr>
-<tr> <td class="numLineCover"> 34</td> <td class="nbHitsCovered"> 198</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 32</td> <td class="nbHitsCovered"> 200</td> <td class="src"><pre class="src"> <span class="keyword">public</span> AclTransform(List<Rule> rules) {</pre></td></tr>
+<tr> <td class="numLineCover"> 33</td> <td class="nbHitsCovered"> 200</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.rules = Collections.unmodifiableList(<span class="keyword">new</span> ArrayList<Rule>(rules));</pre></td></tr>
+<tr> <td class="numLineCover"> 34</td> <td class="nbHitsCovered"> 200</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.Application.html b/coverage/com.google.enterprise.adaptor.Application.html
index fd12e82..e1df48f 100644
--- a/coverage/com.google.enterprise.adaptor.Application.html
+++ b/coverage/com.google.enterprise.adaptor.Application.html
@@ -12,12 +12,12 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="com.google.enterprise.adaptor.Application.html">Application</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">44</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:76px"><span class="text">146/190</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">10</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:70px"><span class="text">24/34</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.4347826086956523;</span>3.435</td></tr>
- <tr><td><a href="com.google.enterprise.adaptor.Application.html">Application$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">7/7</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.4347826086956523;</span>3.435</td></tr>
- <tr><td><a href="com.google.enterprise.adaptor.Application.html">Application$2</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">5/5</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.4347826086956523;</span>3.435</td></tr>
- <tr><td><a href="com.google.enterprise.adaptor.Application.html">Application$ConfigModListener</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">3</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:81px"><span class="text">13/16</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.4347826086956523;</span>3.435</td></tr>
- <tr><td><a href="com.google.enterprise.adaptor.Application.html">Application$ShutdownHook</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">2</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:33px"><span class="text">1/3</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.4347826086956523;</span>3.435</td></tr>
- <tr><td><a href="com.google.enterprise.adaptor.Application.html">Application$SuggestHandlerAbortPolicy</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">5</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:44px"><span class="text">4/9</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.4347826086956523;</span>3.435</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.Application.html">Application</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">46</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:78px"><span class="text">165/211</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">10</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:76px"><span class="text">32/42</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.48;</span>3.48</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.Application.html">Application$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">7/7</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.48;</span>3.48</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.Application.html">Application$2</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">5/5</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.48;</span>3.48</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.Application.html">Application$ConfigModListener</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">3</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:81px"><span class="text">13/16</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.48;</span>3.48</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.Application.html">Application$ShutdownHook</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">2</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:33px"><span class="text">1/3</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.48;</span>3.48</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.Application.html">Application$SuggestHandlerAbortPolicy</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">5</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:44px"><span class="text">4/9</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.48;</span>3.48</td></tr>
</table>
<div class="separator"> </div>
@@ -71,845 +71,892 @@
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">import</span> java.io.File;</pre></td></tr>
<tr> <td class="numLine"> 25</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.io.IOException;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.io.FileInputStream;</pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.net.InetSocketAddress;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.io.IOException;</pre></td></tr>
<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.net.MalformedURLException;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.io.InputStream;</pre></td></tr>
<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.net.URL;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.net.InetSocketAddress;</pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.net.URLConnection;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.net.MalformedURLException;</pre></td></tr>
<tr> <td class="numLine"> 30</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.security.NoSuchAlgorithmException;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.net.URL;</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Arrays;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.net.URLConnection;</pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.HashSet;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.security.NoSuchAlgorithmException;</pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.List;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Arrays;</pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Locale;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.HashSet;</pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Level;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.List;</pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Logger;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Locale;</pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Set;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Map.Entry;</pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.ArrayBlockingQueue;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Properties;</pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.BlockingQueue;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.Set;</pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.Executor;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.ArrayBlockingQueue;</pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.ExecutorService;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.BlockingQueue;</pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.LinkedBlockingQueue;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.Executor;</pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.RejectedExecutionHandler;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.ExecutorService;</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.Semaphore;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.LinkedBlockingQueue;</pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.ThreadPoolExecutor;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.RejectedExecutionHandler;</pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.TimeUnit;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.Semaphore;</pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.ThreadPoolExecutor;</pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> javax.net.ssl.SSLContext;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.concurrent.TimeUnit;</pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">import</span> javax.net.ssl.SSLParameters;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Level;</pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> java.util.logging.Logger;</pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Provides framework for adaptors to act as a stand-alone application. This</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> javax.net.ssl.SSLContext;</pre></td></tr>
<tr> <td class="numLine"> 53</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * entails creating well-configured HttpServer instances, argument parsing,</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">import</span> javax.net.ssl.SSLParameters;</pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * shutdown handling, and more.</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> Application {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Provides framework for adaptors to act as a stand-alone application. This</span></pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String SLEEP_PATH = <span class="string">"/sleep"</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * entails creating well-configured HttpServer instances, argument parsing,</span></pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">final</span> String DEFAULT_CONFIG_FILE</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * shutdown handling, and more.</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = <span class="string">"adaptor-config.properties"</span>;</pre></td></tr>
-<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger log</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> Application {</pre></td></tr>
+<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String SLEEP_PATH = <span class="string">"/sleep"</span>;</pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = Logger.getLogger(Application.<span class="keyword">class</span>.getName());</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">final</span> String DEFAULT_CONFIG_FILE</pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> = <span class="string">"adaptor-config.properties"</span>;</pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Config config;</pre></td></tr>
-<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> GsaCommunicationHandler gsa;</pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> ConfigModificationListener configModListener</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 65</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger log</pre></td></tr>
+<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> = Logger.getLogger(Application.<span class="keyword">class</span>.getName());</pre></td></tr>
<tr> <td class="numLine"> 67</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = <span class="keyword">new</span> ConfigModListener();</pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Config config;</pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * An "inverted" semaphore that has permits available when stop() is running;</span></pre></td></tr>
-<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * at all other times it has no permits. This allows start() to sleep on the</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> GsaCommunicationHandler gsa;</pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> ConfigModificationListener configModListener</pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * semaphore and be woken when stop() is called.</span></pre></td></tr>
+ <td class="src"><pre class="src"> = <span class="keyword">new</span> ConfigModListener();</pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Semaphore shutdownSemaphore = <span class="keyword">new</span> Semaphore(0);</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * An "inverted" semaphore that has permits available when stop() is running;</span></pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Thread shutdownHook;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * at all other times it has no permits. This allows start() to sleep on the</span></pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> HttpServer primaryServer;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * semaphore and be woken when stop() is called.</span></pre></td></tr>
<tr> <td class="numLine"> 76</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> HttpServer dashboardServer;</pre></td></tr>
-<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Application(Adaptor adaptor, Config config) {</pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.config = config;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Semaphore shutdownSemaphore = <span class="keyword">new</span> Semaphore(0);</pre></td></tr>
+<tr> <td class="numLine"> 78</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Thread shutdownHook;</pre></td></tr>
+<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> HttpServer primaryServer;</pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> HttpServer dashboardServer;</pre></td></tr>
+<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> gsa = <span class="keyword">new</span> GsaCommunicationHandler(adaptor, config);</pre></td></tr>
-<tr> <td class="numLineCover"> 82</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 82</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Application(Adaptor adaptor, Config config) {</pre></td></tr>
+<tr> <td class="numLineCover"> 83</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.config = config;</pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Start necessary services for receiving requests and managing background</span></pre></td></tr>
-<tr> <td class="numLine"> 86</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * tasks. Non-daemon threads are created, so call {@link #stop} for graceful</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 85</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> gsa = <span class="keyword">new</span> GsaCommunicationHandler(adaptor, config);</pre></td></tr>
+<tr> <td class="numLineCover"> 86</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * manual shutdown. A shutdown hook is automatically installed that calls</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 88</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * {@code stop()}.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Start necessary services for receiving requests and managing background</span></pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">synchronized</span> <span class="keyword">void</span> start() <span class="keyword">throws</span> IOException, InterruptedException,</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * tasks. Non-daemon threads are created, so call {@link #stop} for graceful</span></pre></td></tr>
<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> StartupException {</pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">synchronized</span> (<span class="keyword">this</span>) {</pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> daemonInit();</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * manual shutdown. A shutdown hook is automatically installed that calls</span></pre></td></tr>
+<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * {@code stop()}.</span></pre></td></tr>
+<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">synchronized</span> <span class="keyword">void</span> start() <span class="keyword">throws</span> IOException, InterruptedException,</pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// The shutdown hook is purposefully not part of the deamon methods,</span></pre></td></tr>
-<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// because it should only be done when running from the command line.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> shutdownHook = <span class="keyword">new</span> Thread(<span class="keyword">new</span> ShutdownHook(), <span class="string">"gsacomm-shutdown"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 98</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> Runtime.getRuntime().addShutdownHook(shutdownHook);</pre></td></tr>
-<tr> <td class="numLineCover"> 99</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> daemonStart();</pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 103</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Reserves resources for later use. This may be run with different</span></pre></td></tr>
-<tr> <td class="numLine"> 106</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * permissions (like as root), to reserve ports or other things that need</span></pre></td></tr>
-<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * elevated privileges.</span></pre></td></tr>
-<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">synchronized</span> <span class="keyword">void</span> daemonInit() <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsUncovered"><a title="Line 110: Conditional coverage 50% (1/2)."> 12</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 110: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (primaryServer != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 111</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(<span class="string">"Already started"</span>);</span></pre></td></tr>
-<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 113</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> primaryServer = createHttpServer(config);</pre></td></tr>
-<tr> <td class="numLineCover"> 114</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> dashboardServer = createDashboardHttpServer(config);</pre></td></tr>
-<tr> <td class="numLine"> 115</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Because once stopped the server can't be reused, we can't reuse its</span></pre></td></tr>
-<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// bind()ed socket if we stop it. So although ideally we would start/stop in</span></pre></td></tr>
-<tr> <td class="numLine"> 117</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// daemonStart/daemonStop, we instead must do it in</span></pre></td></tr>
-<tr> <td class="numLine"> 118</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// daemonInit/daemonDestroy.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 119</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> primaryServer.start();</pre></td></tr>
-<tr> <td class="numLineCover"> 120</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> dashboardServer.start();</pre></td></tr>
-<tr> <td class="numLineCover"> 121</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 123</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Really start. This must be called after a successful {@link #daemonInit}.</span></pre></td></tr>
-<tr> <td class="numLine"> 125</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">synchronized</span> <span class="keyword">void</span> daemonStart() <span class="keyword">throws</span> IOException, InterruptedException,</pre></td></tr>
-<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> StartupException {</pre></td></tr>
-<tr> <td class="numLineCover"> 128</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> AdaptorContext context = gsa.setup(primaryServer, dashboardServer, <span class="keyword">null</span>);</pre></td></tr>
-<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 96</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">synchronized</span> (<span class="keyword">this</span>) {</pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> daemonInit();</pre></td></tr>
+<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 130</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">long</span> sleepDurationMillis = 8000;</pre></td></tr>
-<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// An hour.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 132</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">long</span> maxSleepDurationMillis = 60 * 60 * 1000;</pre></td></tr>
-<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Loop until 1) the adaptor starts successfully, 2) an unrecoverable</span></pre></td></tr>
-<tr> <td class="numLine"> 134</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// StartupException is thrown, 3) stop() is called, or 4) Thread.interrupt()</span></pre></td></tr>
-<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// is called on this thread (which we don't do).</span></pre></td></tr>
-<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Retrying to start the adaptor is helpful in cases where it needs</span></pre></td></tr>
-<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// initialization data from a repository that is temporarily down; if the</span></pre></td></tr>
-<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// adaptor is running as a service, we don't want to stop starting simply</span></pre></td></tr>
-<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// because another computer is down while we start (which would easily be</span></pre></td></tr>
-<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// the case after a power failure).</span></pre></td></tr>
-<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">while</span> (<span class="keyword">true</span>) {</pre></td></tr>
-<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 143</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> gsa.tryToPutVersionIntoConfig();</pre></td></tr>
-<tr> <td class="numLineCover"> 144</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String adaptorType = gsa.getAdaptor().getClass().getName();</pre></td></tr>
-<tr> <td class="numLineCover"> 145</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"about to init {0}"</span>, adaptorType); </pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> gsa.getAdaptor().init(context);</pre></td></tr>
-<tr> <td class="numLineCover"> 147</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 148</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 149</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> ex;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 150</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (StartupException ex) { </pre></td></tr>
-<tr> <td class="numLineCover"> 151</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Failed to initialize adaptor"</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 152</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> ex;</pre></td></tr>
-<tr> <td class="numLineCover"> 153</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (Exception ex) {</pre></td></tr>
-<tr> <td class="numLineCover"> 154</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Failed to initialize adaptor"</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 155</td> <td class="nbHitsCovered"><a title="Line 155: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 155: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (shutdownSemaphore.tryAcquire(sleepDurationMillis,</a></pre></td></tr>
-<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> TimeUnit.MILLISECONDS)) {</pre></td></tr>
-<tr> <td class="numLineCover"> 157</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> shutdownSemaphore.release();</pre></td></tr>
-<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Shutdown initiated.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 159</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
-<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> sleepDurationMillis</pre></td></tr>
-<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = Math.min(sleepDurationMillis * 2, maxSleepDurationMillis);</pre></td></tr>
-<tr> <td class="numLineCover"> 163</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> gsa.ensureLatestConfigLoaded();</pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// The shutdown hook is purposefully not part of the deamon methods,</span></pre></td></tr>
+<tr> <td class="numLine"> 100</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// because it should only be done when running from the command line.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> shutdownHook = <span class="keyword">new</span> Thread(<span class="keyword">new</span> ShutdownHook(), <span class="string">"gsacomm-shutdown"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> Runtime.getRuntime().addShutdownHook(shutdownHook);</pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 104</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 105</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> daemonStart();</pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 107</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 108</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Reserves resources for later use. This may be run with different</span></pre></td></tr>
+<tr> <td class="numLine"> 110</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * permissions (like as root), to reserve ports or other things that need</span></pre></td></tr>
+<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * elevated privileges.</span></pre></td></tr>
+<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 113</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">synchronized</span> <span class="keyword">void</span> daemonInit() <span class="keyword">throws</span> IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 114</td> <td class="nbHitsUncovered"><a title="Line 114: Conditional coverage 50% (1/2)."> 12</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 114: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (primaryServer != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 115</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(<span class="string">"Already started"</span>);</span></pre></td></tr>
+<tr> <td class="numLine"> 116</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 117</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> primaryServer = createHttpServer(config);</pre></td></tr>
+<tr> <td class="numLineCover"> 118</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> dashboardServer = createDashboardHttpServer(config);</pre></td></tr>
+<tr> <td class="numLine"> 119</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Because once stopped the server can't be reused, we can't reuse its</span></pre></td></tr>
+<tr> <td class="numLine"> 120</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// bind()ed socket if we stop it. So although ideally we would start/stop in</span></pre></td></tr>
+<tr> <td class="numLine"> 121</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// daemonStart/daemonStop, we instead must do it in</span></pre></td></tr>
+<tr> <td class="numLine"> 122</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// daemonInit/daemonDestroy.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 123</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> primaryServer.start();</pre></td></tr>
+<tr> <td class="numLineCover"> 124</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> dashboardServer.start();</pre></td></tr>
+<tr> <td class="numLineCover"> 125</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 126</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> config.addConfigModificationListener(configModListener);</pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> gsa.start();</pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 127</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Really start. This must be called after a successful {@link #daemonInit}.</span></pre></td></tr>
+<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">synchronized</span> <span class="keyword">void</span> daemonStart() <span class="keyword">throws</span> IOException, InterruptedException,</pre></td></tr>
+<tr> <td class="numLine"> 131</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> StartupException {</pre></td></tr>
+<tr> <td class="numLineCover"> 132</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> AdaptorContext context = gsa.setup(primaryServer, dashboardServer, <span class="keyword">null</span>);</pre></td></tr>
+<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 134</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">long</span> sleepDurationMillis = 8000;</pre></td></tr>
+<tr> <td class="numLine"> 135</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// An hour.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 136</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">long</span> maxSleepDurationMillis = 60 * 60 * 1000;</pre></td></tr>
+<tr> <td class="numLine"> 137</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Loop until 1) the adaptor starts successfully, 2) an unrecoverable</span></pre></td></tr>
+<tr> <td class="numLine"> 138</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// StartupException is thrown, 3) stop() is called, or 4) Thread.interrupt()</span></pre></td></tr>
+<tr> <td class="numLine"> 139</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// is called on this thread (which we don't do).</span></pre></td></tr>
+<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Retrying to start the adaptor is helpful in cases where it needs</span></pre></td></tr>
+<tr> <td class="numLine"> 141</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// initialization data from a repository that is temporarily down; if the</span></pre></td></tr>
+<tr> <td class="numLine"> 142</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// adaptor is running as a service, we don't want to stop starting simply</span></pre></td></tr>
+<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// because another computer is down while we start (which would easily be</span></pre></td></tr>
+<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// the case after a power failure).</span></pre></td></tr>
+<tr> <td class="numLine"> 145</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">while</span> (<span class="keyword">true</span>) {</pre></td></tr>
+<tr> <td class="numLine"> 146</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 147</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> gsa.tryToPutVersionIntoConfig();</pre></td></tr>
+<tr> <td class="numLineCover"> 148</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String adaptorType = gsa.getAdaptor().getClass().getName();</pre></td></tr>
+<tr> <td class="numLineCover"> 149</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"about to init {0}"</span>, adaptorType); </pre></td></tr>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> gsa.getAdaptor().init(context);</pre></td></tr>
+<tr> <td class="numLineCover"> 151</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 153</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> ex;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (StartupException ex) { </pre></td></tr>
+<tr> <td class="numLineCover"> 155</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Failed to initialize adaptor"</span>, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 156</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> ex;</pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (Exception ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 158</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Failed to initialize adaptor"</span>, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 159</td> <td class="nbHitsCovered"><a title="Line 159: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 159: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (shutdownSemaphore.tryAcquire(sleepDurationMillis,</a></pre></td></tr>
+<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> TimeUnit.MILLISECONDS)) {</pre></td></tr>
+<tr> <td class="numLineCover"> 161</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> shutdownSemaphore.release();</pre></td></tr>
+<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Shutdown initiated.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 163</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
+<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 165</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> sleepDurationMillis</pre></td></tr>
+<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> = Math.min(sleepDurationMillis * 2, maxSleepDurationMillis);</pre></td></tr>
+<tr> <td class="numLineCover"> 167</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> gsa.ensureLatestConfigLoaded();</pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Stop processing incoming requests and background tasks, allowing graceful</span></pre></td></tr>
-<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * shutdown.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 171</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> config.addConfigModificationListener(configModListener);</pre></td></tr>
+<tr> <td class="numLineCover"> 172</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> gsa.start();</pre></td></tr>
+<tr> <td class="numLineCover"> 173</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Stop processing incoming requests and background tasks, allowing graceful</span></pre></td></tr>
+<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * shutdown.</span></pre></td></tr>
+<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> stop(<span class="keyword">long</span> time, TimeUnit unit) {</pre></td></tr>
-<tr> <td class="numLineCover"> 176</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> daemonStop(time, unit);</pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> daemonDestroy(time, unit);</pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">synchronized</span> (<span class="keyword">this</span>) {</pre></td></tr>
-<tr> <td class="numLineCover"> 179</td> <td class="nbHitsUncovered"><a title="Line 179: Conditional coverage 50% (1/2)."> 10</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 179: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (shutdownHook != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> daemonStop(time, unit);</pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> daemonDestroy(time, unit);</pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">synchronized</span> (<span class="keyword">this</span>) {</pre></td></tr>
+<tr> <td class="numLineCover"> 183</td> <td class="nbHitsUncovered"><a title="Line 183: Conditional coverage 50% (1/2)."> 10</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 183: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (shutdownHook != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 181</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> Runtime.getRuntime().removeShutdownHook(shutdownHook);</pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IllegalStateException ex) {</span></pre></td></tr>
-<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 185</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> Runtime.getRuntime().removeShutdownHook(shutdownHook);</pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IllegalStateException ex) {</span></pre></td></tr>
+<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Already executing hook.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 184</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 185</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> shutdownHook = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 187</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 188</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 188</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> shutdownHook = <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Stop all the services we provide. This is the opposite of {@link</span></pre></td></tr>
-<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * #daemonStart}.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 192</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">void</span> daemonStop(<span class="keyword">long</span> time, TimeUnit unit) {</pre></td></tr>
-<tr> <td class="numLineCover"> 195</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> shutdownSemaphore.release();</pre></td></tr>
-<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> <span class="keyword">synchronized</span> (<span class="keyword">this</span>) {</pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsCovered"><a title="Line 198: Conditional coverage 100% (2/2)."> 19</a></td> <td class="src"><pre class="src"> <a title="Line 198: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (primaryServer == <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 199</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(<span class="string">"Already stopped"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 201</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> config.removeConfigModificationListener(configModListener);</pre></td></tr>
-<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> gsa.stop(time, unit);</pre></td></tr>
-<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> gsa.getAdaptor().destroy();</pre></td></tr>
-<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> gsa.teardown();</pre></td></tr>
-<tr> <td class="numLineCover"> 207</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 210</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> interrupted = <span class="keyword">false</span>;</pre></td></tr>
-<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">while</span> (<span class="keyword">true</span>) {</pre></td></tr>
-<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 213</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> shutdownSemaphore.acquire();</pre></td></tr>
-<tr> <td class="numLineCover"> 214</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 216</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> interrupted = <span class="keyword">true</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 219</td> <td class="nbHitsUncovered"><a title="Line 219: Conditional coverage 50% (1/2)."> 19</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 219: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (interrupted) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Thread.currentThread().interrupt();</span></pre></td></tr>
-<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 222</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Release reserved resources. This is the opposite of {@link</span></pre></td></tr>
-<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * #daemonInit}.</span></pre></td></tr>
-<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Stop all the services we provide. This is the opposite of {@link</span></pre></td></tr>
+<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * #daemonStart}.</span></pre></td></tr>
+<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">void</span> daemonStop(<span class="keyword">long</span> time, TimeUnit unit) {</pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> shutdownSemaphore.release();</pre></td></tr>
+<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 201</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> <span class="keyword">synchronized</span> (<span class="keyword">this</span>) {</pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"><a title="Line 202: Conditional coverage 100% (2/2)."> 20</a></td> <td class="src"><pre class="src"> <a title="Line 202: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (primaryServer == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(<span class="string">"Already stopped"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 205</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> config.removeConfigModificationListener(configModListener);</pre></td></tr>
+<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> gsa.stop(time, unit);</pre></td></tr>
+<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 208</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> gsa.getAdaptor().destroy();</pre></td></tr>
+<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 210</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> gsa.teardown();</pre></td></tr>
+<tr> <td class="numLineCover"> 211</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 212</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 214</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> interrupted = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">while</span> (<span class="keyword">true</span>) {</pre></td></tr>
+<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> shutdownSemaphore.acquire();</pre></td></tr>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 219</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 220</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> interrupted = <span class="keyword">true</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 223</td> <td class="nbHitsUncovered"><a title="Line 223: Conditional coverage 50% (1/2)."> 20</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 223: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (interrupted) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Thread.currentThread().interrupt();</span></pre></td></tr>
+<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 227</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">synchronized</span> <span class="keyword">void</span> daemonDestroy(<span class="keyword">long</span> time, TimeUnit unit) {</pre></td></tr>
-<tr> <td class="numLineCover"> 230</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> httpServerShutdown(primaryServer, time, unit);</pre></td></tr>
-<tr> <td class="numLineCover"> 231</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> log.finer(<span class="string">"Completed primary server stop"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 232</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> primaryServer = <span class="keyword">null</span>;</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Release reserved resources. This is the opposite of {@link</span></pre></td></tr>
+<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * #daemonInit}.</span></pre></td></tr>
+<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">synchronized</span> <span class="keyword">void</span> daemonDestroy(<span class="keyword">long</span> time, TimeUnit unit) {</pre></td></tr>
+<tr> <td class="numLineCover"> 234</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> httpServerShutdown(primaryServer, time, unit);</pre></td></tr>
+<tr> <td class="numLineCover"> 235</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> log.finer(<span class="string">"Completed primary server stop"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 236</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> primaryServer = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 234</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> httpServerShutdown(dashboardServer, time, unit);</pre></td></tr>
-<tr> <td class="numLineCover"> 235</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> log.finer(<span class="string">"Completed dashboard stop"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 236</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> dashboardServer = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 237</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 238</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> httpServerShutdown(dashboardServer, time, unit);</pre></td></tr>
+<tr> <td class="numLineCover"> 239</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> log.finer(<span class="string">"Completed dashboard stop"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 240</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> dashboardServer = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 241</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">void</span> httpServerShutdown(HttpServer server, <span class="keyword">long</span> time,</pre></td></tr>
-<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> TimeUnit unit) {</pre></td></tr>
-<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Workaround Java Bug 7105369.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 242</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> SleepHandler sleepHandler = <span class="keyword">new</span> SleepHandler(100 <span class="comment">/* millis */</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 243</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> server.createContext(SLEEP_PATH, sleepHandler);</pre></td></tr>
-<tr> <td class="numLineCover"> 244</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> issueSleepGetRequest(server.getAddress(), server <span class="keyword">instanceof</span> HttpsServer);</pre></td></tr>
<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> server.stop((<span class="keyword">int</span>) unit.toSeconds(time));</pre></td></tr>
-<tr> <td class="numLineCover"> 247</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> ((ExecutorService) server.getExecutor()).shutdownNow();</pre></td></tr>
-<tr> <td class="numLineCover"> 248</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> }</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// Workaround Java Bug 7105369.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> SleepHandler sleepHandler = <span class="keyword">new</span> SleepHandler(100 <span class="comment">/* millis */</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 247</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> server.createContext(SLEEP_PATH, sleepHandler);</pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> issueSleepGetRequest(server.getAddress(), server <span class="keyword">instanceof</span> HttpsServer);</pre></td></tr>
<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Issues a GET request to a SleepHandler. This is used to workaround Java</span></pre></td></tr>
-<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Bug 7105369.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 250</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> server.stop((<span class="keyword">int</span>) unit.toSeconds(time));</pre></td></tr>
+<tr> <td class="numLineCover"> 251</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> ((ExecutorService) server.getExecutor()).shutdownNow();</pre></td></tr>
+<tr> <td class="numLineCover"> 252</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p>The bug is an issue with HttpServer where stop() waits the full amount</span></pre></td></tr>
-<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * of allotted time if the serve is idle. However, if a request is being</span></pre></td></tr>
-<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * handled when stop() is called, then it will return as soon as all requests</span></pre></td></tr>
-<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * are processed, or the allotted time is reached.</span></pre></td></tr>
-<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * <p>Thus, this workaround tries to force a request to be in-procees when</span></pre></td></tr>
-<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * stop() is called, so that it can return sooner. We issue a request to a</span></pre></td></tr>
-<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * SleepHandler that takes a fixed amount of time to process the request</span></pre></td></tr>
-<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * before calling stop(). In the event everything goes as planned, the request</span></pre></td></tr>
-<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * completes after stop() has been called and allows stop() to exit quickly.</span></pre></td></tr>
-<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">void</span> issueSleepGetRequest(InetSocketAddress address,</pre></td></tr>
-<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">boolean</span> isHttps) {</pre></td></tr>
-<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> URL url;</pre></td></tr>
-<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 269</td> <td class="nbHitsCovered"><a title="Line 269: Conditional coverage 100% (2/2)."> 24</a></td> <td class="src"><pre class="src"> <a title="Line 269: Conditional coverage 100% (2/2)."> url = <span class="keyword">new</span> URL(isHttps ? <span class="string">"https"</span> : <span class="string">"http"</span>,</a></pre></td></tr>
-<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> address.getAddress().getHostAddress(), address.getPort(), SLEEP_PATH);</pre></td></tr>
-<tr> <td class="numLineCover"> 271</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (MalformedURLException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 272</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.WARNING,</span></pre></td></tr>
-<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"Unexpected error. Shutting down will be slow."</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 274</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 275</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">final</span> URLConnection conn;</pre></td></tr>
-<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 279</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> conn = url.openConnection();</pre></td></tr>
-<tr> <td class="numLineCover"> 280</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> conn.connect();</pre></td></tr>
-<tr> <td class="numLineCover"> 281</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (IOException ex) {</pre></td></tr>
-<tr> <td class="numLineCover"> 282</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Error performing shutdown GET"</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 283</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 284</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Provide some time for the connect() to be processed on the server.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 287</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> Thread.sleep(15);</pre></td></tr>
-<tr> <td class="numLineCover"> 288</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 289</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Thread.currentThread().interrupt();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 290</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 291</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> <span class="keyword">new</span> Thread(<span class="keyword">new</span> Runnable() {</pre></td></tr>
-<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> run() {</pre></td></tr>
-<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 295</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> conn.getInputStream().close();</pre></td></tr>
-<tr> <td class="numLineCover"> 296</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> log.finer(<span class="string">"Closed shutdown GET"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 297</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (IOException ex) {</pre></td></tr>
-<tr> <td class="numLineCover"> 298</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Error closing stream of shutdown GET"</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 299</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 300</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }).start();</pre></td></tr>
-<tr> <td class="numLineCover"> 302</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">static</span> HttpServer createHttpServer(Config config) <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> HttpServer server;</pre></td></tr>
-<tr> <td class="numLineCover"> 306</td> <td class="nbHitsCovered"><a title="Line 306: Conditional coverage 100% (2/2)."> 12</a></td> <td class="src"><pre class="src"> <a title="Line 306: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!config.isServerSecure()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 307</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> server = HttpServer.create();</pre></td></tr>
-<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 309</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> server = HttpsServer.create();</pre></td></tr>
-<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 311</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> HttpsConfigurator httpsConf</pre></td></tr>
-<tr> <td class="numLineCover"> 312</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> = <span class="keyword">new</span> HttpsConfigurator(SSLContext.getDefault()) {</pre></td></tr>
-<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> configure(HttpsParameters params) {</pre></td></tr>
-<tr> <td class="numLineCover"> 314</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> SSLParameters sslParams</pre></td></tr>
-<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = getSSLContext().getDefaultSSLParameters();</pre></td></tr>
-<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Allow verifying the GSA and other trusted computers.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 317</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> sslParams.setWantClientAuth(<span class="keyword">true</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 318</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> params.setSSLParameters(sslParams);</pre></td></tr>
-<tr> <td class="numLineCover"> 319</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> };</pre></td></tr>
-<tr> <td class="numLineCover"> 321</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> ((HttpsServer) server).setHttpsConfigurator(httpsConf);</pre></td></tr>
-<tr> <td class="numLineCover"> 322</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (java.security.NoSuchAlgorithmException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 323</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 324</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 327</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">int</span> maxThreads = config.getServerMaxWorkerThreads();</pre></td></tr>
-<tr> <td class="numLineCover"> 328</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">int</span> queueCapacity = config.getServerQueueCapacity();</pre></td></tr>
-<tr> <td class="numLineCover"> 329</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> BlockingQueue<Runnable> blockingQueue</pre></td></tr>
-<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = <span class="keyword">new</span> ArrayBlockingQueue<Runnable>(queueCapacity);</pre></td></tr>
-<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// The Executor can't reject jobs directly, because HttpServer does not</span></pre></td></tr>
-<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// appear to handle that case.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 333</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> RejectedExecutionHandler policy</pre></td></tr>
-<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = <span class="keyword">new</span> SuggestHandlerAbortPolicy(HttpExchanges.abortImmediately);</pre></td></tr>
-<tr> <td class="numLineCover"> 335</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> Executor executor = <span class="keyword">new</span> ThreadPoolExecutor(maxThreads, maxThreads,</pre></td></tr>
-<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> 1, TimeUnit.MINUTES, blockingQueue, policy);</pre></td></tr>
-<tr> <td class="numLineCover"> 337</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> server.setExecutor(executor);</pre></td></tr>
-<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 339</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> server.bind(<span class="keyword">new</span> InetSocketAddress(config.getServerPort()), 0);</pre></td></tr>
-<tr> <td class="numLineCover"> 340</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> log.info(<span class="string">"GSA host name: "</span> + config.getGsaHostname());</pre></td></tr>
-<tr> <td class="numLineCover"> 341</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> log.info(<span class="string">"server is listening on port #"</span> + server.getAddress().getPort());</pre></td></tr>
-<tr> <td class="numLineCover"> 342</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">return</span> server;</pre></td></tr>
-<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">static</span> HttpServer createDashboardHttpServer(Config config)</pre></td></tr>
-<tr> <td class="numLine"> 346</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 347</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> secure = config.isServerSecure();</pre></td></tr>
-<tr> <td class="numLine"> 348</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> HttpServer server;</pre></td></tr>
-<tr> <td class="numLineCover"> 349</td> <td class="nbHitsCovered"><a title="Line 349: Conditional coverage 100% (2/2)."> 12</a></td> <td class="src"><pre class="src"> <a title="Line 349: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!secure) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 350</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> server = HttpServer.create();</pre></td></tr>
-<tr> <td class="numLine"> 351</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 352</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> server = HttpsServer.create();</pre></td></tr>
-<tr> <td class="numLine"> 353</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> SSLContext defaultSslContext;</pre></td></tr>
-<tr> <td class="numLine"> 354</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 355</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> defaultSslContext = SSLContext.getDefault();</pre></td></tr>
-<tr> <td class="numLineCover"> 356</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NoSuchAlgorithmException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 357</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 358</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 359</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> HttpsConfigurator httpsConf = <span class="keyword">new</span> HttpsConfigurator(defaultSslContext);</pre></td></tr>
-<tr> <td class="numLineCover"> 360</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> ((HttpsServer) server).setHttpsConfigurator(httpsConf);</pre></td></tr>
-<tr> <td class="numLine"> 361</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 362</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// The Dashboard is on a separate port to prevent malicious HTML documents</span></pre></td></tr>
-<tr> <td class="numLine"> 363</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// in the user's repository from performing admin actions with</span></pre></td></tr>
-<tr> <td class="numLine"> 364</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// XMLHttpRequest or the like, as the HTML page will then be blocked by</span></pre></td></tr>
-<tr> <td class="numLine"> 365</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// same-origin policies.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 366</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> server.bind(<span class="keyword">new</span> InetSocketAddress(config.getServerDashboardPort()), 0);</pre></td></tr>
-<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 368</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Use separate Executor for Dashboard to allow the administrator to</span></pre></td></tr>
-<tr> <td class="numLine"> 369</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// investigate why things are going wrong without waiting on the normal work</span></pre></td></tr>
-<tr> <td class="numLine"> 370</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// queue.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 371</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">int</span> maxThreads = 4;</pre></td></tr>
-<tr> <td class="numLineCover"> 372</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> Executor executor = <span class="keyword">new</span> ThreadPoolExecutor(maxThreads, maxThreads,</pre></td></tr>
-<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> 10, TimeUnit.MINUTES, <span class="keyword">new</span> LinkedBlockingQueue<Runnable>());</pre></td></tr>
-<tr> <td class="numLineCover"> 374</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> server.setExecutor(executor);</pre></td></tr>
-<tr> <td class="numLine"> 375</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 376</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> log.info(<span class="string">"dashboard is listening on port #"</span></pre></td></tr>
-<tr> <td class="numLine"> 377</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + server.getAddress().getPort());</pre></td></tr>
-<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 379</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">return</span> server;</pre></td></tr>
-<tr> <td class="numLine"> 380</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 381</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 382</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/** Returns the {@link GsaCommunicationHandler} used by this instance. */</span></pre></td></tr>
-<tr> <td class="numLine"> 383</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> GsaCommunicationHandler getGsaCommunicationHandler() {</pre></td></tr>
-<tr> <td class="numLineCover"> 384</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> gsa;</pre></td></tr>
-<tr> <td class="numLine"> 385</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 386</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 387</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/** Returns the {@link Config} used by this instance. */</span></pre></td></tr>
-<tr> <td class="numLine"> 388</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Config getConfig() {</pre></td></tr>
-<tr> <td class="numLineCover"> 389</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> config;</pre></td></tr>
-<tr> <td class="numLine"> 390</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 391</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 392</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 393</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Load default configuration file and parse command line options.</span></pre></td></tr>
-<tr> <td class="numLine"> 394</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Issues a GET request to a SleepHandler. This is used to workaround Java</span></pre></td></tr>
+<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Bug 7105369.</span></pre></td></tr>
+<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 395</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return unused command line arguments</span></pre></td></tr>
-<tr> <td class="numLine"> 396</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @throws IllegalStateException when not all configuration keys have values</span></pre></td></tr>
-<tr> <td class="numLine"> 397</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p>The bug is an issue with HttpServer where stop() waits the full amount</span></pre></td></tr>
+<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * of allotted time if the serve is idle. However, if a request is being</span></pre></td></tr>
+<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * handled when stop() is called, then it will return as soon as all requests</span></pre></td></tr>
+<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * are processed, or the allotted time is reached.</span></pre></td></tr>
+<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * <p>Thus, this workaround tries to force a request to be in-procees when</span></pre></td></tr>
+<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * stop() is called, so that it can return sooner. We issue a request to a</span></pre></td></tr>
+<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * SleepHandler that takes a fixed amount of time to process the request</span></pre></td></tr>
+<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * before calling stop(). In the event everything goes as planned, the request</span></pre></td></tr>
+<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * completes after stop() has been called and allows stop() to exit quickly.</span></pre></td></tr>
+<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">void</span> issueSleepGetRequest(InetSocketAddress address,</pre></td></tr>
+<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">boolean</span> isHttps) {</pre></td></tr>
+<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> URL url;</pre></td></tr>
+<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 273</td> <td class="nbHitsCovered"><a title="Line 273: Conditional coverage 100% (2/2)."> 24</a></td> <td class="src"><pre class="src"> <a title="Line 273: Conditional coverage 100% (2/2)."> url = <span class="keyword">new</span> URL(isHttps ? <span class="string">"https"</span> : <span class="string">"http"</span>,</a></pre></td></tr>
+<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> address.getAddress().getHostAddress(), address.getPort(), SLEEP_PATH);</pre></td></tr>
+<tr> <td class="numLineCover"> 275</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (MalformedURLException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 276</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.WARNING,</span></pre></td></tr>
+<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="string">"Unexpected error. Shutting down will be slow."</span>, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 278</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 279</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">final</span> URLConnection conn;</pre></td></tr>
+<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 283</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> conn = url.openConnection();</pre></td></tr>
+<tr> <td class="numLineCover"> 284</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> conn.connect();</pre></td></tr>
+<tr> <td class="numLineCover"> 285</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (IOException ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 286</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Error performing shutdown GET"</span>, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 287</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 288</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Provide some time for the connect() to be processed on the server.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 291</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> Thread.sleep(15);</pre></td></tr>
+<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 293</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Thread.currentThread().interrupt();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 294</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 295</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> <span class="keyword">new</span> Thread(<span class="keyword">new</span> Runnable() {</pre></td></tr>
+<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> run() {</pre></td></tr>
+<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 299</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> conn.getInputStream().close();</pre></td></tr>
+<tr> <td class="numLineCover"> 300</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> log.finer(<span class="string">"Closed shutdown GET"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 301</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (IOException ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 302</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Error closing stream of shutdown GET"</span>, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 303</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 304</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }).start();</pre></td></tr>
+<tr> <td class="numLineCover"> 306</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 308</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">static</span> HttpServer createHttpServer(Config config) <span class="keyword">throws</span> IOException {</pre></td></tr>
+<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> HttpServer server;</pre></td></tr>
+<tr> <td class="numLineCover"> 310</td> <td class="nbHitsCovered"><a title="Line 310: Conditional coverage 100% (2/2)."> 12</a></td> <td class="src"><pre class="src"> <a title="Line 310: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!config.isServerSecure()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 311</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> server = HttpServer.create();</pre></td></tr>
+<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 313</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> server = HttpsServer.create();</pre></td></tr>
+<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 315</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> HttpsConfigurator httpsConf</pre></td></tr>
+<tr> <td class="numLineCover"> 316</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> = <span class="keyword">new</span> HttpsConfigurator(SSLContext.getDefault()) {</pre></td></tr>
+<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> configure(HttpsParameters params) {</pre></td></tr>
+<tr> <td class="numLineCover"> 318</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> SSLParameters sslParams</pre></td></tr>
+<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> = getSSLContext().getDefaultSSLParameters();</pre></td></tr>
+<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Allow verifying the GSA and other trusted computers.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 321</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> sslParams.setWantClientAuth(<span class="keyword">true</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 322</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> params.setSSLParameters(sslParams);</pre></td></tr>
+<tr> <td class="numLineCover"> 323</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> };</pre></td></tr>
+<tr> <td class="numLineCover"> 325</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> ((HttpsServer) server).setHttpsConfigurator(httpsConf);</pre></td></tr>
+<tr> <td class="numLineCover"> 326</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (java.security.NoSuchAlgorithmException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 327</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 328</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 331</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">int</span> maxThreads = config.getServerMaxWorkerThreads();</pre></td></tr>
+<tr> <td class="numLineCover"> 332</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">int</span> queueCapacity = config.getServerQueueCapacity();</pre></td></tr>
+<tr> <td class="numLineCover"> 333</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> BlockingQueue<Runnable> blockingQueue</pre></td></tr>
+<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> = <span class="keyword">new</span> ArrayBlockingQueue<Runnable>(queueCapacity);</pre></td></tr>
+<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// The Executor can't reject jobs directly, because HttpServer does not</span></pre></td></tr>
+<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// appear to handle that case.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 337</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> RejectedExecutionHandler policy</pre></td></tr>
+<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> = <span class="keyword">new</span> SuggestHandlerAbortPolicy(HttpExchanges.abortImmediately);</pre></td></tr>
+<tr> <td class="numLineCover"> 339</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> Executor executor = <span class="keyword">new</span> ThreadPoolExecutor(maxThreads, maxThreads,</pre></td></tr>
+<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> 1, TimeUnit.MINUTES, blockingQueue, policy);</pre></td></tr>
+<tr> <td class="numLineCover"> 341</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> server.setExecutor(executor);</pre></td></tr>
+<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 343</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> server.bind(<span class="keyword">new</span> InetSocketAddress(config.getServerPort()), 0);</pre></td></tr>
+<tr> <td class="numLineCover"> 344</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> log.info(<span class="string">"GSA host name: "</span> + config.getGsaHostname());</pre></td></tr>
+<tr> <td class="numLineCover"> 345</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> log.info(<span class="string">"server is listening on port #"</span> + server.getAddress().getPort());</pre></td></tr>
+<tr> <td class="numLineCover"> 346</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">return</span> server;</pre></td></tr>
+<tr> <td class="numLine"> 347</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 348</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 349</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">static</span> HttpServer createDashboardHttpServer(Config config)</pre></td></tr>
+<tr> <td class="numLine"> 350</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">throws</span> IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 351</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> secure = config.isServerSecure();</pre></td></tr>
+<tr> <td class="numLine"> 352</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> HttpServer server;</pre></td></tr>
+<tr> <td class="numLineCover"> 353</td> <td class="nbHitsCovered"><a title="Line 353: Conditional coverage 100% (2/2)."> 12</a></td> <td class="src"><pre class="src"> <a title="Line 353: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!secure) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 354</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> server = HttpServer.create();</pre></td></tr>
+<tr> <td class="numLine"> 355</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 356</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> server = HttpsServer.create();</pre></td></tr>
+<tr> <td class="numLine"> 357</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> SSLContext defaultSslContext;</pre></td></tr>
+<tr> <td class="numLine"> 358</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 359</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> defaultSslContext = SSLContext.getDefault();</pre></td></tr>
+<tr> <td class="numLineCover"> 360</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (NoSuchAlgorithmException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 361</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 362</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 363</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> HttpsConfigurator httpsConf = <span class="keyword">new</span> HttpsConfigurator(defaultSslContext);</pre></td></tr>
+<tr> <td class="numLineCover"> 364</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> ((HttpsServer) server).setHttpsConfigurator(httpsConf);</pre></td></tr>
+<tr> <td class="numLine"> 365</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 366</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// The Dashboard is on a separate port to prevent malicious HTML documents</span></pre></td></tr>
+<tr> <td class="numLine"> 367</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// in the user's repository from performing admin actions with</span></pre></td></tr>
+<tr> <td class="numLine"> 368</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// XMLHttpRequest or the like, as the HTML page will then be blocked by</span></pre></td></tr>
+<tr> <td class="numLine"> 369</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// same-origin policies.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 370</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> server.bind(<span class="keyword">new</span> InetSocketAddress(config.getServerDashboardPort()), 0);</pre></td></tr>
+<tr> <td class="numLine"> 371</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 372</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Use separate Executor for Dashboard to allow the administrator to</span></pre></td></tr>
+<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// investigate why things are going wrong without waiting on the normal work</span></pre></td></tr>
+<tr> <td class="numLine"> 374</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// queue.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 375</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">int</span> maxThreads = 4;</pre></td></tr>
+<tr> <td class="numLineCover"> 376</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> Executor executor = <span class="keyword">new</span> ThreadPoolExecutor(maxThreads, maxThreads,</pre></td></tr>
+<tr> <td class="numLine"> 377</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> 10, TimeUnit.MINUTES, <span class="keyword">new</span> LinkedBlockingQueue<Runnable>());</pre></td></tr>
+<tr> <td class="numLineCover"> 378</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> server.setExecutor(executor);</pre></td></tr>
+<tr> <td class="numLine"> 379</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 380</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> log.info(<span class="string">"dashboard is listening on port #"</span></pre></td></tr>
+<tr> <td class="numLine"> 381</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + server.getAddress().getPort());</pre></td></tr>
+<tr> <td class="numLine"> 382</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 383</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">return</span> server;</pre></td></tr>
+<tr> <td class="numLine"> 384</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 385</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 386</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/** Returns the {@link GsaCommunicationHandler} used by this instance. */</span></pre></td></tr>
+<tr> <td class="numLine"> 387</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> GsaCommunicationHandler getGsaCommunicationHandler() {</pre></td></tr>
+<tr> <td class="numLineCover"> 388</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> gsa;</pre></td></tr>
+<tr> <td class="numLine"> 389</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 390</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 391</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/** Returns the {@link Config} used by this instance. */</span></pre></td></tr>
+<tr> <td class="numLine"> 392</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Config getConfig() {</pre></td></tr>
+<tr> <td class="numLineCover"> 393</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> config;</pre></td></tr>
+<tr> <td class="numLine"> 394</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 395</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 396</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 397</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Load default configuration file and parse command line options.</span></pre></td></tr>
<tr> <td class="numLine"> 398</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">static</span> String[] autoConfig(Config config, String[] args, File configFile) {</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 399</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return unused command line arguments</span></pre></td></tr>
+<tr> <td class="numLine"> 400</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @throws IllegalStateException when not all configuration keys have values</span></pre></td></tr>
+<tr> <td class="numLine"> 401</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 402</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">static</span> String[] autoConfig(Config config, String[] args, File configFile) {</pre></td></tr>
+<tr> <td class="numLineCover"> 403</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> File sysPropertiesAdditions = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 404</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">int</span> i;</pre></td></tr>
-<tr> <td class="numLineCover"> 400</td> <td class="nbHitsCovered"><a title="Line 400: Conditional coverage 100% (2/2)."> 17</a></td> <td class="src"><pre class="src"> <a title="Line 400: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (i = 0; i < args.length; i++) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 401</td> <td class="nbHitsUncovered"><a title="Line 401: Conditional coverage 50% (1/2)."> 11</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 401: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!args[i].startsWith(<span class="string">"-D"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 402</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">break</span>;</span></pre></td></tr>
-<tr> <td class="numLine"> 403</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 404</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> String arg = args[i].substring(2);</pre></td></tr>
-<tr> <td class="numLineCover"> 405</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> String[] parts = arg.split(<span class="string">"="</span>, 2);</pre></td></tr>
-<tr> <td class="numLineCover"> 406</td> <td class="nbHitsUncovered"><a title="Line 406: Conditional coverage 50% (1/2)."> 11</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 406: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (parts.length < 2) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 405</td> <td class="nbHitsCovered"><a title="Line 405: Conditional coverage 100% (2/2)."> 20</a></td> <td class="src"><pre class="src"> <a title="Line 405: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (i = 0; i < args.length; i++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 406</td> <td class="nbHitsUncovered"><a title="Line 406: Conditional coverage 50% (1/2)."> 13</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 406: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!args[i].startsWith(<span class="string">"-D"</span>)) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 407</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">break</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 408</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 409</td> <td class="nbHitsCovered"><a title="Line 409: Conditional coverage 100% (2/2)."> 11</a></td> <td class="src"><pre class="src"> <a title="Line 409: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="string">"adaptor.configfile"</span>.equals(parts[0])) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 410</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> configFile = <span class="keyword">new</span> File(parts[1]);</pre></td></tr>
-<tr> <td class="numLine"> 411</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 412</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> config.setValue(parts[0], parts[1]);</pre></td></tr>
+<tr> <td class="numLineCover"> 409</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String arg = args[i].substring(2);</pre></td></tr>
+<tr> <td class="numLineCover"> 410</td> <td class="nbHitsCovered"> 13</td> <td class="src"><pre class="src"> String[] parts = arg.split(<span class="string">"="</span>, 2);</pre></td></tr>
+<tr> <td class="numLineCover"> 411</td> <td class="nbHitsUncovered"><a title="Line 411: Conditional coverage 50% (1/2)."> 13</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 411: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (parts.length < 2) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 412</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">break</span>;</span></pre></td></tr>
<tr> <td class="numLine"> 413</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 414</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 415</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> loadConfigFile(config, configFile);</pre></td></tr>
-<tr> <td class="numLineCover"> 416</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> config.validate();</pre></td></tr>
-<tr> <td class="numLineCover"> 417</td> <td class="nbHitsCovered"><a title="Line 417: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 417: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (i == 0) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 418</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> args;</pre></td></tr>
-<tr> <td class="numLine"> 419</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 420</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Arrays.copyOfRange(args, i, args.length);</pre></td></tr>
+<tr> <td class="numLineCover"> 414</td> <td class="nbHitsCovered"><a title="Line 414: Conditional coverage 100% (2/2)."> 13</a></td> <td class="src"><pre class="src"> <a title="Line 414: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="string">"adaptor.configfile"</span>.equals(parts[0])) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 415</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> configFile = <span class="keyword">new</span> File(parts[1]);</pre></td></tr>
+<tr> <td class="numLineCover"> 416</td> <td class="nbHitsCovered"><a title="Line 416: Conditional coverage 100% (2/2)."> 11</a></td> <td class="src"><pre class="src"> <a title="Line 416: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (<span class="string">"sys.properties.file"</span>.equals(parts[0])) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 417</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> sysPropertiesAdditions = <span class="keyword">new</span> File(parts[1]);</pre></td></tr>
+<tr> <td class="numLine"> 418</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 419</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> config.setValue(parts[0], parts[1]);</pre></td></tr>
+<tr> <td class="numLine"> 420</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 421</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 422</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 423</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 424</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 425</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Loads the provided config file, if it exists. It squelches any errors so</span></pre></td></tr>
-<tr> <td class="numLine"> 426</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * that you are free to call it without error handling, since this is</span></pre></td></tr>
+<tr> <td class="numLineCover"> 422</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> processSystemProperties(sysPropertiesAdditions);</pre></td></tr>
+<tr> <td class="numLineCover"> 423</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> loadConfigFile(config, configFile);</pre></td></tr>
+<tr> <td class="numLineCover"> 424</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> config.validate();</pre></td></tr>
+<tr> <td class="numLineCover"> 425</td> <td class="nbHitsCovered"><a title="Line 425: Conditional coverage 100% (2/2)."> 6</a></td> <td class="src"><pre class="src"> <a title="Line 425: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (i == 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 426</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> args;</pre></td></tr>
<tr> <td class="numLine"> 427</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * typically non-fatal.</span></pre></td></tr>
-<tr> <td class="numLine"> 428</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 428</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Arrays.copyOfRange(args, i, args.length);</pre></td></tr>
<tr> <td class="numLine"> 429</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">void</span> loadConfigFile(Config config, File configFile) {</pre></td></tr>
-<tr> <td class="numLineCover"> 430</td> <td class="nbHitsUncovered"><a title="Line 430: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 6</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 430: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (configFile.exists() && configFile.isFile()) {</a></span></pre></td></tr>
-<tr> <td class="numLine"> 431</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 432</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> config.load(configFile);</pre></td></tr>
-<tr> <td class="numLineCover"> 433</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 434</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> System.err.println(<span class="string">"Exception when reading "</span> + configFile);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 435</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ex.printStackTrace(System.err);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 436</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 437</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 438</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 439</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 440</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 441</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Main for adaptors to utilize when wanting to act as an application. This</span></pre></td></tr>
-<tr> <td class="numLine"> 442</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * method primarily parses arguments and creates an application instance</span></pre></td></tr>
-<tr> <td class="numLine"> 443</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * before calling it's {@link #start}.</span></pre></td></tr>
-<tr> <td class="numLine"> 444</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 445</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * @return the application instance in use</span></pre></td></tr>
-<tr> <td class="numLine"> 446</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 447</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> Application main(Adaptor adaptor, String[] args) {</pre></td></tr>
-<tr> <td class="numLineCover"> 448</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.info(<span class="keyword">new</span> Dashboard.JavaVersionStatusSource().retrieveStatus()</span></pre></td></tr>
-<tr> <td class="numLine"> 449</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> .getMessage(Locale.ENGLISH));</pre></td></tr>
-<tr> <td class="numLineCover"> 450</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Application app = daemonMain(adaptor, args);</span></pre></td></tr>
-<tr> <td class="numLine"> 451</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 452</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Setup providing content.</span></pre></td></tr>
-<tr> <td class="numLine"> 453</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLine"> 454</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 455</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> app.start();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 456</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.info(<span class="string">"doc content serving started"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 457</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (StartupException e) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 458</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(<span class="string">"could not start serving"</span>, e);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 459</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException e) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 460</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(<span class="string">"could not start serving"</span>, e);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 461</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 462</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException e) {</span></pre></td></tr>
-<tr> <td class="numLine"> 463</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Do not call stop - it has already been called.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 464</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(<span class="string">"could not start serving"</span>, e);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 465</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable t) {</span></pre></td></tr>
-<tr> <td class="numLine"> 466</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Abnormal termination. Make sure any services that may have been</span></pre></td></tr>
-<tr> <td class="numLine"> 467</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// started are shut down.</span></pre></td></tr>
-<tr> <td class="numLine"> 468</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 469</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> app.stop(3, TimeUnit.SECONDS);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 470</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ignored) {</span></pre></td></tr>
-<tr> <td class="numLine"> 471</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// It was a noble try. Just get out.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 472</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 473</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Now rethrow.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 474</td> <td class="nbHitsUncovered"><a title="Line 474: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 474: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (t <span class="keyword">instanceof</span> RuntimeException) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 475</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> (RuntimeException) t;</span></pre></td></tr>
-<tr> <td class="numLineCover"> 476</td> <td class="nbHitsUncovered"><a title="Line 476: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 476: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (t <span class="keyword">instanceof</span> Error) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 477</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> (Error) t;</span></pre></td></tr>
-<tr> <td class="numLine"> 478</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLine"> 479</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Very unlikely to happen.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 480</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(t);</span></pre></td></tr>
-<tr> <td class="numLine"> 481</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 482</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 483</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> app;</span></pre></td></tr>
-<tr> <td class="numLine"> 484</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 430</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 431</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 432</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">void</span> processSystemProperties(File extraProps) {</pre></td></tr>
+<tr> <td class="numLineCover"> 433</td> <td class="nbHitsCovered"><a title="Line 433: Conditional coverage 100% (2/2)."> 7</a></td> <td class="src"><pre class="src"> <a title="Line 433: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="keyword">null</span> == extraProps) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 434</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> log.log(Level.CONFIG, <span class="string">"no extra system properties to load"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 435</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">return</span>;</pre></td></tr>
+<tr> <td class="numLine"> 436</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 437</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 438</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> FileInputStream extras = <span class="keyword">new</span> FileInputStream(extraProps);</pre></td></tr>
+<tr> <td class="numLineCover"> 439</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> processSystemProperties(extras);</pre></td></tr>
+<tr> <td class="numLineCover"> 440</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> extras.close();</pre></td></tr>
+<tr> <td class="numLineCover"> 441</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException e) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 442</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.CONFIG, <span class="string">"could not read system properties file {0}"</span>,</span></pre></td></tr>
+<tr> <td class="numLine"> 443</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> extraProps.getAbsolutePath());</pre></td></tr>
+<tr> <td class="numLineCover"> 444</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 445</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 446</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 447</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">void</span> processSystemProperties(InputStream extraProps) </pre></td></tr>
+<tr> <td class="numLine"> 448</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">throws</span> IOException {</pre></td></tr>
+<tr> <td class="numLineCover"> 449</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> Properties extra = <span class="keyword">new</span> Properties();</pre></td></tr>
+<tr> <td class="numLineCover"> 450</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> extra.load(extraProps);</pre></td></tr>
+<tr> <td class="numLineCover"> 451</td> <td class="nbHitsCovered"><a title="Line 451: Conditional coverage 100% (2/2)."> 1</a></td> <td class="src"><pre class="src"> <a title="Line 451: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Entry<Object, Object> e : extra.entrySet()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 452</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> String previous = System.setProperty(<span class="string">""</span> + e.getKey(), <span class="string">""</span> + e.getValue());</pre></td></tr>
+<tr> <td class="numLineCover"> 453</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.FINE, <span class="string">"sys property {0} set to {1}; was {2}"</span>,</pre></td></tr>
+<tr> <td class="numLine"> 454</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">new</span> Object[] {e.getKey(), e.getValue(), previous}); </pre></td></tr>
+<tr> <td class="numLineCover"> 455</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 456</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 457</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 458</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 459</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Loads the provided config file, if it exists. It squelches any errors so</span></pre></td></tr>
+<tr> <td class="numLine"> 460</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * that you are free to call it without error handling, since this is</span></pre></td></tr>
+<tr> <td class="numLine"> 461</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * typically non-fatal.</span></pre></td></tr>
+<tr> <td class="numLine"> 462</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 463</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">void</span> loadConfigFile(Config config, File configFile) {</pre></td></tr>
+<tr> <td class="numLineCover"> 464</td> <td class="nbHitsUncovered"><a title="Line 464: Conditional coverage 83% (5/6) [each condition: 100%, 100%, 50%]."> 7</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 464: Conditional coverage 83% (5/6) [each condition: 100%, 100%, 50%]."> <span class="keyword">if</span> (<span class="keyword">null</span> != configFile && configFile.exists() && configFile.isFile()) {</a></span></pre></td></tr>
+<tr> <td class="numLine"> 465</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 466</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> config.load(configFile);</pre></td></tr>
+<tr> <td class="numLineCover"> 467</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 468</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> System.err.println(<span class="string">"Exception when reading "</span> + configFile);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 469</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> ex.printStackTrace(System.err);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 470</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 471</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 472</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 473</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 474</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 475</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Main for adaptors to utilize when wanting to act as an application. This</span></pre></td></tr>
+<tr> <td class="numLine"> 476</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * method primarily parses arguments and creates an application instance</span></pre></td></tr>
+<tr> <td class="numLine"> 477</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * before calling it's {@link #start}.</span></pre></td></tr>
+<tr> <td class="numLine"> 478</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 479</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * @return the application instance in use</span></pre></td></tr>
+<tr> <td class="numLine"> 480</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 481</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> Application main(Adaptor adaptor, String[] args) {</pre></td></tr>
+<tr> <td class="numLineCover"> 482</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.info(<span class="keyword">new</span> Dashboard.JavaVersionStatusSource().retrieveStatus()</span></pre></td></tr>
+<tr> <td class="numLine"> 483</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> .getMessage(Locale.ENGLISH));</pre></td></tr>
+<tr> <td class="numLineCover"> 484</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Application app = daemonMain(adaptor, args);</span></pre></td></tr>
<tr> <td class="numLine"> 485</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 486</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">// Setup providing content.</span></pre></td></tr>
<tr> <td class="numLine"> 487</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Performs basic bootstrapping like normal {@link #main}, but does not start</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
<tr> <td class="numLine"> 488</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * the application.</span></pre></td></tr>
-<tr> <td class="numLine"> 489</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 490</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">static</span> Application daemonMain(Adaptor adaptor, String[] args) {</pre></td></tr>
-<tr> <td class="numLineCover"> 491</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> Config config = <span class="keyword">new</span> Config();</pre></td></tr>
-<tr> <td class="numLineCover"> 492</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> adaptor.initConfig(config);</pre></td></tr>
-<tr> <td class="numLineCover"> 493</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> autoConfig(config, args, <span class="keyword">new</span> File(DEFAULT_CONFIG_FILE));</pre></td></tr>
-<tr> <td class="numLineCover"> 494</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> Application(adaptor, config);</pre></td></tr>
-<tr> <td class="numLine"> 495</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 496</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 497</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> ShutdownHook <span class="keyword">implements</span> Runnable {</pre></td></tr>
-<tr> <td class="numLine"> 498</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 499</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> run() {</pre></td></tr>
-<tr> <td class="numLineCover"> 500</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> stop(3, TimeUnit.SECONDS);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 501</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 502</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 503</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 504</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 505</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Executes Runnable in current thread, but only after setting a thread-local</span></pre></td></tr>
-<tr> <td class="numLine"> 506</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * object. The code that will be run, is expected to take notice of the set</span></pre></td></tr>
-<tr> <td class="numLine"> 507</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * variable and abort immediately. This is a hack.</span></pre></td></tr>
-<tr> <td class="numLine"> 508</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 509</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">class</span> SuggestHandlerAbortPolicy</pre></td></tr>
-<tr> <td class="numLine"> 510</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">implements</span> RejectedExecutionHandler {</pre></td></tr>
-<tr> <td class="numLine"> 511</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> ThreadLocal<Object> abortImmediately;</pre></td></tr>
-<tr> <td class="numLineCover"> 512</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Object signal = <span class="keyword">new</span> Object();</pre></td></tr>
-<tr> <td class="numLine"> 513</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 514</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">public</span> SuggestHandlerAbortPolicy(ThreadLocal<Object> abortImmediately) {</pre></td></tr>
-<tr> <td class="numLineCover"> 515</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.abortImmediately = abortImmediately;</pre></td></tr>
-<tr> <td class="numLineCover"> 516</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 517</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 518</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 519</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> rejectedExecution(Runnable r, ThreadPoolExecutor executor) {</pre></td></tr>
-<tr> <td class="numLineCover"> 520</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> abortImmediately.set(signal);</span></pre></td></tr>
-<tr> <td class="numLine"> 521</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 522</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> r.run();</span></pre></td></tr>
-<tr> <td class="numLine"> 523</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 524</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> abortImmediately.set(<span class="keyword">null</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 525</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLineCover"> 526</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
-<tr> <td class="numLine"> 527</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 528</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 529</td> <td class="nbHitsCovered"> 36</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> ConfigModListener <span class="keyword">implements</span> ConfigModificationListener {</pre></td></tr>
-<tr> <td class="numLine"> 530</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 531</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> configModified(ConfigModificationEvent ev) {</pre></td></tr>
-<tr> <td class="numLineCover"> 532</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> Set<String> modifiedKeys = ev.getModifiedKeys();</pre></td></tr>
-<tr> <td class="numLineCover"> 533</td> <td class="nbHitsCovered"><a title="Line 533: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 533: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (modifiedKeys.contains(<span class="string">"adaptor.fullListingSchedule"</span>)) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 534</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> gsa.rescheduleFullListing(</pre></td></tr>
-<tr> <td class="numLine"> 535</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> ev.getNewConfig().getAdaptorFullListingSchedule());</pre></td></tr>
-<tr> <td class="numLine"> 536</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 489</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> app.start();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 490</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.info(<span class="string">"doc content serving started"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 491</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (StartupException e) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 492</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(<span class="string">"could not start serving"</span>, e);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 493</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException e) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 494</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(<span class="string">"could not start serving"</span>, e);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 495</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 496</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException e) {</span></pre></td></tr>
+<tr> <td class="numLine"> 497</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Do not call stop - it has already been called.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 498</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(<span class="string">"could not start serving"</span>, e);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 499</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable t) {</span></pre></td></tr>
+<tr> <td class="numLine"> 500</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Abnormal termination. Make sure any services that may have been</span></pre></td></tr>
+<tr> <td class="numLine"> 501</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// started are shut down.</span></pre></td></tr>
+<tr> <td class="numLine"> 502</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 503</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> app.stop(3, TimeUnit.SECONDS);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 504</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Throwable ignored) {</span></pre></td></tr>
+<tr> <td class="numLine"> 505</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// It was a noble try. Just get out.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 506</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 507</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Now rethrow.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 508</td> <td class="nbHitsUncovered"><a title="Line 508: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 508: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (t <span class="keyword">instanceof</span> RuntimeException) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 509</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> (RuntimeException) t;</span></pre></td></tr>
+<tr> <td class="numLineCover"> 510</td> <td class="nbHitsUncovered"><a title="Line 510: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 510: Conditional coverage 0% (0/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (t <span class="keyword">instanceof</span> Error) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 511</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> (Error) t;</span></pre></td></tr>
+<tr> <td class="numLine"> 512</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLine"> 513</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Very unlikely to happen.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 514</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(t);</span></pre></td></tr>
+<tr> <td class="numLine"> 515</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 516</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 517</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> app;</span></pre></td></tr>
+<tr> <td class="numLine"> 518</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 519</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 520</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 521</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Performs basic bootstrapping like normal {@link #main}, but does not start</span></pre></td></tr>
+<tr> <td class="numLine"> 522</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * the application.</span></pre></td></tr>
+<tr> <td class="numLine"> 523</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 524</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">static</span> Application daemonMain(Adaptor adaptor, String[] args) {</pre></td></tr>
+<tr> <td class="numLineCover"> 525</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> Config config = <span class="keyword">new</span> Config();</pre></td></tr>
+<tr> <td class="numLineCover"> 526</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> adaptor.initConfig(config);</pre></td></tr>
+<tr> <td class="numLineCover"> 527</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> autoConfig(config, args, <span class="keyword">new</span> File(DEFAULT_CONFIG_FILE));</pre></td></tr>
+<tr> <td class="numLineCover"> 528</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> Application(adaptor, config);</pre></td></tr>
+<tr> <td class="numLine"> 529</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 530</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 531</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> ShutdownHook <span class="keyword">implements</span> Runnable {</pre></td></tr>
+<tr> <td class="numLine"> 532</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 533</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> run() {</pre></td></tr>
+<tr> <td class="numLineCover"> 534</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> stop(3, TimeUnit.SECONDS);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 535</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 536</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 537</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 538</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// List of "safe" keys that can be updated without a restart.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 539</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> List<String> safeKeys = Arrays.asList(<span class="string">"adaptor.fullListingSchedule"</span>);</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 539</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Executes Runnable in current thread, but only after setting a thread-local</span></pre></td></tr>
<tr> <td class="numLine"> 540</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// Set of "unsafe" keys that have been modified.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 541</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> Set<String> modifiedKeysRequiringRestart</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * object. The code that will be run, is expected to take notice of the set</span></pre></td></tr>
+<tr> <td class="numLine"> 541</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * variable and abort immediately. This is a hack.</span></pre></td></tr>
<tr> <td class="numLine"> 542</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = <span class="keyword">new</span> HashSet<String>(modifiedKeys);</pre></td></tr>
-<tr> <td class="numLineCover"> 543</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> modifiedKeysRequiringRestart.removeAll(safeKeys);</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 543</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">class</span> SuggestHandlerAbortPolicy</pre></td></tr>
<tr> <td class="numLine"> 544</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// If there are modified "unsafe" keys, then we restart things to make</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">implements</span> RejectedExecutionHandler {</pre></td></tr>
<tr> <td class="numLine"> 545</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// sure all the code is up-to-date with the new values.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 546</td> <td class="nbHitsCovered"><a title="Line 546: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 546: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!modifiedKeysRequiringRestart.isEmpty()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 547</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.warning(<span class="string">"Unsafe configuration keys modified. To ensure a sane "</span></pre></td></tr>
-<tr> <td class="numLine"> 548</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> + <span class="string">"state, the adaptor is restarting."</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 549</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> daemonStop(3, TimeUnit.SECONDS);</pre></td></tr>
-<tr> <td class="numLine"> 550</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 551</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> daemonStart();</pre></td></tr>
-<tr> <td class="numLineCover"> 552</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Exception ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 553</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.SEVERE, <span class="string">"Automatic restart failed"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 554</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 555</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 556</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 557</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 558</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> ThreadLocal<Object> abortImmediately;</pre></td></tr>
+<tr> <td class="numLineCover"> 546</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Object signal = <span class="keyword">new</span> Object();</pre></td></tr>
+<tr> <td class="numLine"> 547</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 548</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">public</span> SuggestHandlerAbortPolicy(ThreadLocal<Object> abortImmediately) {</pre></td></tr>
+<tr> <td class="numLineCover"> 549</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.abortImmediately = abortImmediately;</pre></td></tr>
+<tr> <td class="numLineCover"> 550</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 551</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 552</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 553</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> rejectedExecution(Runnable r, ThreadPoolExecutor executor) {</pre></td></tr>
+<tr> <td class="numLineCover"> 554</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> abortImmediately.set(signal);</span></pre></td></tr>
+<tr> <td class="numLine"> 555</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 556</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> r.run();</span></pre></td></tr>
+<tr> <td class="numLine"> 557</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 558</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> abortImmediately.set(<span class="keyword">null</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 559</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLineCover"> 560</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> }</span></pre></td></tr>
+<tr> <td class="numLine"> 561</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 559</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 562</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 563</td> <td class="nbHitsCovered"> 38</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">class</span> ConfigModListener <span class="keyword">implements</span> ConfigModificationListener {</pre></td></tr>
+<tr> <td class="numLine"> 564</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 565</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> configModified(ConfigModificationEvent ev) {</pre></td></tr>
+<tr> <td class="numLineCover"> 566</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> Set<String> modifiedKeys = ev.getModifiedKeys();</pre></td></tr>
+<tr> <td class="numLineCover"> 567</td> <td class="nbHitsCovered"><a title="Line 567: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 567: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (modifiedKeys.contains(<span class="string">"adaptor.fullListingSchedule"</span>)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 568</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> gsa.rescheduleFullListing(</pre></td></tr>
+<tr> <td class="numLine"> 569</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> ev.getNewConfig().getAdaptorFullListingSchedule());</pre></td></tr>
+<tr> <td class="numLine"> 570</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 571</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 572</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// List of "safe" keys that can be updated without a restart.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 573</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> List<String> safeKeys = Arrays.asList(<span class="string">"adaptor.fullListingSchedule"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 574</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// Set of "unsafe" keys that have been modified.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 575</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> Set<String> modifiedKeysRequiringRestart</pre></td></tr>
+<tr> <td class="numLine"> 576</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> = <span class="keyword">new</span> HashSet<String>(modifiedKeys);</pre></td></tr>
+<tr> <td class="numLineCover"> 577</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> modifiedKeysRequiringRestart.removeAll(safeKeys);</pre></td></tr>
+<tr> <td class="numLine"> 578</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// If there are modified "unsafe" keys, then we restart things to make</span></pre></td></tr>
+<tr> <td class="numLine"> 579</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// sure all the code is up-to-date with the new values.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 580</td> <td class="nbHitsCovered"><a title="Line 580: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 580: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!modifiedKeysRequiringRestart.isEmpty()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 581</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.warning(<span class="string">"Unsafe configuration keys modified. To ensure a sane "</span></pre></td></tr>
+<tr> <td class="numLine"> 582</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + <span class="string">"state, the adaptor is restarting."</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 583</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> daemonStop(3, TimeUnit.SECONDS);</pre></td></tr>
+<tr> <td class="numLine"> 584</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 585</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> daemonStart();</pre></td></tr>
+<tr> <td class="numLineCover"> 586</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (Exception ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 587</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.SEVERE, <span class="string">"Automatic restart failed"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 588</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> RuntimeException(ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 589</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 590</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 591</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 592</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 593</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
diff --git a/coverage/com.google.enterprise.adaptor.Config.html b/coverage/com.google.enterprise.adaptor.Config.html
index b67be96..555822e 100644
--- a/coverage/com.google.enterprise.adaptor.Config.html
+++ b/coverage/com.google.enterprise.adaptor.Config.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="com.google.enterprise.adaptor.Config.html">Config</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">16</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:92px"><span class="text">193/209</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">12</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:80px"><span class="text">50/62</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.796875;</span>1.797</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.Config.html">Config</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">15</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:92px"><span class="text">194/209</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">11</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:82px"><span class="text">51/62</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.796875;</span>1.797</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.Config.html">Config$1</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">1</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:75px"><span class="text">3/4</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">1</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:50px"><span class="text">1/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.796875;</span>1.797</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.Config.html">Config$2</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">1</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:75px"><span class="text">3/4</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">1</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:75px"><span class="text">3/4</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.796875;</span>1.797</td></tr>
<tr><td><a href="com.google.enterprise.adaptor.Config.html">Config$3</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">4/4</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">2/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">1.796875;</span>1.797</td></tr>
@@ -332,17 +332,17 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/** Configuration keys whose default value is {@code null}. */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 157</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Set<String> noDefaultConfig = <span class="keyword">new</span> HashSet<String>();</pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Set<String> noDefaultConfig = <span class="keyword">new</span> HashSet<String>();</pre></td></tr>
<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/** Default configuration values. */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 159</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Properties defaultConfig = <span class="keyword">new</span> Properties();</pre></td></tr>
+<tr> <td class="numLineCover"> 159</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Properties defaultConfig = <span class="keyword">new</span> Properties();</pre></td></tr>
<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/** Overriding configuration values loaded from command line. */</span></pre></td></tr>
<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Reads require no additional locks, but modifications require lock on 'this'</span></pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// to prevent lost updates.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 163</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">volatile</span> Properties config = <span class="keyword">new</span> Properties(defaultConfig);</pre></td></tr>
+<tr> <td class="numLineCover"> 163</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">volatile</span> Properties config = <span class="keyword">new</span> Properties(defaultConfig);</pre></td></tr>
<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td>
@@ -353,7 +353,7 @@
<td class="src"><pre class="src"> <span class="keyword">private</span> File configFile;</pre></td></tr>
<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">long</span> configFileLastModified;</pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> <span class="keyword">private</span> List<ConfigModificationListener> modificationListeners</pre></td></tr>
+<tr> <td class="numLineCover"> 169</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> <span class="keyword">private</span> List<ConfigModificationListener> modificationListeners</pre></td></tr>
<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> = <span class="keyword">new</span> CopyOnWriteArrayList<ConfigModificationListener>();</pre></td></tr>
<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td>
@@ -366,24 +366,24 @@
<td class="src"><pre class="src"> <span class="comment"> * values by default.</span></pre></td></tr>
<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 176</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Map<String, ValueComputer> computeMap</pre></td></tr>
+<tr> <td class="numLineCover"> 176</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> <span class="keyword">private</span> Map<String, ValueComputer> computeMap</pre></td></tr>
<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> = <span class="keyword">new</span> HashMap<String, ValueComputer>();</pre></td></tr>
<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 179</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Config() {</pre></td></tr>
-<tr> <td class="numLineCover"> 180</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> String hostname = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 179</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Config() {</pre></td></tr>
+<tr> <td class="numLineCover"> 180</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> String hostname = <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 182</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> hostname = InetAddress.getLocalHost().getCanonicalHostName();</pre></td></tr>
-<tr> <td class="numLineCover"> 183</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> hostname = hostname.toLowerCase(Locale.ENGLISH); <span class="comment">// work around GSA 7.0</span></pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> hostname = InetAddress.getLocalHost().getCanonicalHostName();</pre></td></tr>
+<tr> <td class="numLineCover"> 183</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> hostname = hostname.toLowerCase(Locale.ENGLISH); <span class="comment">// work around GSA 7.0</span></pre></td></tr>
<tr> <td class="numLineCover"> 184</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UnknownHostException ex) {</span></pre></td></tr>
<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Ignore</span></pre></td></tr>
-<tr> <td class="numLineCover"> 186</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 187</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.hostname"</span>, hostname);</pre></td></tr>
-<tr> <td class="numLineCover"> 188</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.port"</span>, <span class="string">"5678"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.reverseProxyPort"</span>, <span class="string">"GENERATE"</span>, <span class="keyword">new</span> ValueComputer() {</pre></td></tr>
+<tr> <td class="numLineCover"> 186</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 187</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.hostname"</span>, hostname);</pre></td></tr>
+<tr> <td class="numLineCover"> 188</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.port"</span>, <span class="string">"5678"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.reverseProxyPort"</span>, <span class="string">"GENERATE"</span>, <span class="keyword">new</span> ValueComputer() {</pre></td></tr>
<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String compute(String rawValue) {</pre></td></tr>
<tr> <td class="numLineCover"> 191</td> <td class="nbHitsUncovered"><a title="Line 191: Conditional coverage 50% (1/2)."> 37</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 191: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="string">"GENERATE"</span>.equals(rawValue)) {</a></span></pre></td></tr>
@@ -395,7 +395,7 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> });</pre></td></tr>
-<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.reverseProxyProtocol"</span>, <span class="string">"GENERATE"</span>, <span class="keyword">new</span> ValueComputer() {</pre></td></tr>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.reverseProxyProtocol"</span>, <span class="string">"GENERATE"</span>, <span class="keyword">new</span> ValueComputer() {</pre></td></tr>
<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String compute(String rawValue) {</pre></td></tr>
<tr> <td class="numLineCover"> 199</td> <td class="nbHitsUncovered"><a title="Line 199: Conditional coverage 50% (1/2)."> 37</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 199: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="string">"GENERATE"</span>.equals(rawValue)) {</a></span></pre></td></tr>
@@ -407,32 +407,32 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> });</pre></td></tr>
-<tr> <td class="numLineCover"> 205</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.dashboardPort"</span>, <span class="string">"5679"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.docIdPath"</span>, <span class="string">"/doc/"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 207</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.fullAccessHosts"</span>, <span class="string">""</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.secure"</span>, <span class="string">"false"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 209</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.keyAlias"</span>, <span class="string">"adaptor"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 210</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.maxWorkerThreads"</span>, <span class="string">"16"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 205</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.dashboardPort"</span>, <span class="string">"5679"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.docIdPath"</span>, <span class="string">"/doc/"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 207</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.fullAccessHosts"</span>, <span class="string">""</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 208</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.secure"</span>, <span class="string">"false"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 209</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.keyAlias"</span>, <span class="string">"adaptor"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 210</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.maxWorkerThreads"</span>, <span class="string">"16"</span>);</pre></td></tr>
<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// A queue that takes one second to drain, assuming 16 threads and 100 ms</span></pre></td></tr>
<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// for each request.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 213</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.queueCapacity"</span>, <span class="string">"160"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 214</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.useCompression"</span>, <span class="string">"true"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 215</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.samlEntityId"</span>, <span class="string">"http://google.com/enterprise/gsa/adaptor"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 216</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.hostname"</span>, <span class="keyword">null</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.admin.hostname"</span>, <span class="string">""</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 218</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.characterEncoding"</span>, <span class="string">"UTF-8"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 219</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.version"</span>, <span class="string">"GENERATE"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 220</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.614FeedWorkaroundEnabled"</span>, <span class="string">"false"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 221</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.70AuthMethodWorkaroundEnabled"</span>, <span class="string">"false"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 222</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.samlEntityId"</span>,</pre></td></tr>
+<tr> <td class="numLineCover"> 213</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.queueCapacity"</span>, <span class="string">"160"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 214</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.useCompression"</span>, <span class="string">"true"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 215</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"server.samlEntityId"</span>, <span class="string">"http://google.com/enterprise/gsa/adaptor"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 216</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.hostname"</span>, <span class="keyword">null</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.admin.hostname"</span>, <span class="string">""</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.characterEncoding"</span>, <span class="string">"UTF-8"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 219</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.version"</span>, <span class="string">"GENERATE"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 220</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.614FeedWorkaroundEnabled"</span>, <span class="string">"false"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.70AuthMethodWorkaroundEnabled"</span>, <span class="string">"false"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 222</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.samlEntityId"</span>,</pre></td></tr>
<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"http://google.com/enterprise/gsa/security-manager"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.scoringType"</span>, <span class="string">"content"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 225</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"docId.isUrl"</span>, <span class="string">"false"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 226</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"feed.archiveDirectory"</span>, <span class="string">""</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 227</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"feed.name"</span>, <span class="string">"GENERATE"</span>, <span class="keyword">new</span> ValueComputer() {</pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.scoringType"</span>, <span class="string">"content"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 225</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"docId.isUrl"</span>, <span class="string">"false"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"feed.archiveDirectory"</span>, <span class="string">""</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 227</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"feed.name"</span>, <span class="string">"GENERATE"</span>, <span class="keyword">new</span> ValueComputer() {</pre></td></tr>
<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String compute(String rawValue) {</pre></td></tr>
<tr> <td class="numLineCover"> 229</td> <td class="nbHitsCovered"><a title="Line 229: Conditional coverage 100% (2/2)."> 31</a></td> <td class="src"><pre class="src"> <a title="Line 229: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="string">"GENERATE"</span>.equals(rawValue)) {</a></pre></td></tr>
@@ -446,23 +446,23 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> });</pre></td></tr>
-<tr> <td class="numLineCover"> 236</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"feed.noRecrawlBitEnabled"</span>, <span class="string">"false"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 237</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"feed.crawlImmediatelyBitEnabled"</span>, <span class="string">"false"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 236</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"feed.noRecrawlBitEnabled"</span>, <span class="string">"false"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 237</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"feed.crawlImmediatelyBitEnabled"</span>, <span class="string">"false"</span>);</pre></td></tr>
<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">//addKey("feed.noFollowBitEnabled", "false");</span></pre></td></tr>
-<tr> <td class="numLineCover"> 239</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"feed.maxUrls"</span>, <span class="string">"5000"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 240</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"adaptor.pushDocIdsOnStartup"</span>, <span class="string">"true"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 239</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"feed.maxUrls"</span>, <span class="string">"5000"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 240</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"adaptor.pushDocIdsOnStartup"</span>, <span class="string">"true"</span>);</pre></td></tr>
<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// 3:00 AM every day.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 242</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"adaptor.fullListingSchedule"</span>, <span class="string">"0 3 * * *"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 242</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"adaptor.fullListingSchedule"</span>, <span class="string">"0 3 * * *"</span>);</pre></td></tr>
<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// 15 minutes.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 244</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"adaptor.incrementalPollPeriodSecs"</span>, <span class="string">"900"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 245</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"adaptor.docContentTimeoutSecs"</span>, <span class="string">"180"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"adaptor.docHeaderTimeoutSecs"</span>, <span class="string">"30"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 247</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"transform.pipeline"</span>, <span class="string">""</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 248</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"journal.reducedMem"</span>, <span class="string">"true"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 249</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.acceptsDocControlsHeader"</span>, <span class="string">"GENERATE"</span>, <span class="keyword">new</span> ValueComputer() {</pre></td></tr>
+<tr> <td class="numLineCover"> 244</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"adaptor.incrementalPollPeriodSecs"</span>, <span class="string">"900"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 245</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"adaptor.docContentTimeoutSecs"</span>, <span class="string">"180"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"adaptor.docHeaderTimeoutSecs"</span>, <span class="string">"30"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 247</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"transform.pipeline"</span>, <span class="string">""</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 248</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"journal.reducedMem"</span>, <span class="string">"true"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 249</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"gsa.acceptsDocControlsHeader"</span>, <span class="string">"GENERATE"</span>, <span class="keyword">new</span> ValueComputer() {</pre></td></tr>
<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String compute(String rawValue) {</pre></td></tr>
<tr> <td class="numLineCover"> 251</td> <td class="nbHitsUncovered"><a title="Line 251: Conditional coverage 50% (1/2)."> 19</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 251: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!<span class="string">"GENERATE"</span>.equals(rawValue)) {</a></span></pre></td></tr>
@@ -488,8 +488,8 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> });</pre></td></tr>
-<tr> <td class="numLineCover"> 267</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> addKey(<span class="string">"adaptor.markAllDocsAsPublic"</span>, <span class="string">"false"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 268</td> <td class="nbHitsCovered"> 79</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 267</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> addKey(<span class="string">"adaptor.markAllDocsAsPublic"</span>, <span class="string">"false"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 268</td> <td class="nbHitsCovered"> 83</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
@@ -869,7 +869,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 471</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">boolean</span> markAllDocsAsPublic() {</pre></td></tr>
-<tr> <td class="numLineCover"> 472</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Boolean.parseBoolean(getValue(<span class="string">"adaptor.markAllDocsAsPublic"</span>));</pre></td></tr>
+<tr> <td class="numLineCover"> 472</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Boolean.parseBoolean(getValue(<span class="string">"adaptor.markAllDocsAsPublic"</span>));</pre></td></tr>
<tr> <td class="numLine"> 473</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 474</td> <td class="nbHits"> </td>
@@ -1034,7 +1034,7 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 563</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">boolean</span> isJournalReducedMem() {</pre></td></tr>
-<tr> <td class="numLineCover"> 564</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Boolean.parseBoolean(getValue(<span class="string">"journal.reducedMem"</span>));</pre></td></tr>
+<tr> <td class="numLineCover"> 564</td> <td class="nbHitsCovered"> 44</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Boolean.parseBoolean(getValue(<span class="string">"journal.reducedMem"</span>));</pre></td></tr>
<tr> <td class="numLine"> 565</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 566</td> <td class="nbHits"> </td>
@@ -1278,25 +1278,25 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 714</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> validate() {</pre></td></tr>
-<tr> <td class="numLineCover"> 715</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> validate(config);</pre></td></tr>
-<tr> <td class="numLineCover"> 716</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 715</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> validate(config);</pre></td></tr>
+<tr> <td class="numLineCover"> 716</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 717</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 718</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> validate(Properties config) {</pre></td></tr>
-<tr> <td class="numLineCover"> 719</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> Set<String> unset = <span class="keyword">new</span> HashSet<String>();</pre></td></tr>
-<tr> <td class="numLineCover"> 720</td> <td class="nbHitsCovered"><a title="Line 720: Conditional coverage 100% (2/2)."> 16</a></td> <td class="src"><pre class="src"> <a title="Line 720: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String key : noDefaultConfig) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 721</td> <td class="nbHitsCovered"><a title="Line 721: Conditional coverage 100% (2/2)."> 16</a></td> <td class="src"><pre class="src"> <a title="Line 721: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (config.getProperty(key) == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 719</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> Set<String> unset = <span class="keyword">new</span> HashSet<String>();</pre></td></tr>
+<tr> <td class="numLineCover"> 720</td> <td class="nbHitsCovered"><a title="Line 720: Conditional coverage 100% (2/2)."> 17</a></td> <td class="src"><pre class="src"> <a title="Line 720: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (String key : noDefaultConfig) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 721</td> <td class="nbHitsCovered"><a title="Line 721: Conditional coverage 100% (2/2)."> 17</a></td> <td class="src"><pre class="src"> <a title="Line 721: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (config.getProperty(key) == <span class="keyword">null</span>) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 722</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> unset.add(key);</pre></td></tr>
<tr> <td class="numLine"> 723</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 724</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 725</td> <td class="nbHitsCovered"><a title="Line 725: Conditional coverage 100% (2/2)."> 16</a></td> <td class="src"><pre class="src"> <a title="Line 725: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (unset.size() != 0) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 725</td> <td class="nbHitsCovered"><a title="Line 725: Conditional coverage 100% (2/2)."> 17</a></td> <td class="src"><pre class="src"> <a title="Line 725: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (unset.size() != 0) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 726</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> InvalidConfigurationException(<span class="string">"Missing configuration values: "</span> + unset);</pre></td></tr>
<tr> <td class="numLine"> 727</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 728</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 728</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 729</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 730</td> <td class="nbHits"> </td>
@@ -1315,14 +1315,14 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 737</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getRawValue(String key) {</pre></td></tr>
-<tr> <td class="numLineCover"> 738</td> <td class="nbHitsCovered"> 1180</td> <td class="src"><pre class="src"> String value = config.getProperty(key);</pre></td></tr>
-<tr> <td class="numLineCover"> 739</td> <td class="nbHitsUncovered"><a title="Line 739: Conditional coverage 50% (1/2)."> 1180</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 739: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (value == <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 740</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> InvalidConfigurationException(MessageFormat.format(</span></pre></td></tr>
+<tr> <td class="numLineCover"> 738</td> <td class="nbHitsCovered"> 1190</td> <td class="src"><pre class="src"> String value = config.getProperty(key);</pre></td></tr>
+<tr> <td class="numLineCover"> 739</td> <td class="nbHitsCovered"><a title="Line 739: Conditional coverage 100% (2/2)."> 1190</a></td> <td class="src"><pre class="src"> <a title="Line 739: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (value == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 740</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> InvalidConfigurationException(MessageFormat.format(</pre></td></tr>
<tr> <td class="numLine"> 741</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="string">"You must set configuration key ''{0}''."</span>, key));</pre></td></tr>
<tr> <td class="numLine"> 742</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 743</td> <td class="nbHitsCovered"> 1180</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value;</pre></td></tr>
+<tr> <td class="numLineCover"> 743</td> <td class="nbHitsCovered"> 1188</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value;</pre></td></tr>
<tr> <td class="numLine"> 744</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 745</td> <td class="nbHits"> </td>
@@ -1349,13 +1349,13 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 756</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> String getValue(String key) {</pre></td></tr>
-<tr> <td class="numLineCover"> 757</td> <td class="nbHitsCovered"> 1179</td> <td class="src"><pre class="src"> String value = getRawValue(key);</pre></td></tr>
-<tr> <td class="numLineCover"> 758</td> <td class="nbHitsCovered"> 1179</td> <td class="src"><pre class="src"> ValueComputer computer = computeMap.get(key);</pre></td></tr>
-<tr> <td class="numLineCover"> 759</td> <td class="nbHitsCovered"><a title="Line 759: Conditional coverage 100% (2/2)."> 1179</a></td> <td class="src"><pre class="src"> <a title="Line 759: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (computer != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 757</td> <td class="nbHitsCovered"> 1189</td> <td class="src"><pre class="src"> String value = getRawValue(key);</pre></td></tr>
+<tr> <td class="numLineCover"> 758</td> <td class="nbHitsCovered"> 1187</td> <td class="src"><pre class="src"> ValueComputer computer = computeMap.get(key);</pre></td></tr>
+<tr> <td class="numLineCover"> 759</td> <td class="nbHitsCovered"><a title="Line 759: Conditional coverage 100% (2/2)."> 1187</a></td> <td class="src"><pre class="src"> <a title="Line 759: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (computer != <span class="keyword">null</span>) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 760</td> <td class="nbHitsCovered"> 125</td> <td class="src"><pre class="src"> value = computer.compute(value);</pre></td></tr>
<tr> <td class="numLine"> 761</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 762</td> <td class="nbHitsCovered"> 1179</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value;</pre></td></tr>
+<tr> <td class="numLineCover"> 762</td> <td class="nbHitsCovered"> 1187</td> <td class="src"><pre class="src"> <span class="keyword">return</span> value;</pre></td></tr>
<tr> <td class="numLine"> 763</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 764</td> <td class="nbHits"> </td>
@@ -1407,27 +1407,27 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 791</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">synchronized</span> <span class="keyword">void</span> addKey(String key, String defaultValue) {</pre></td></tr>
-<tr> <td class="numLineCover"> 792</td> <td class="nbHitsCovered"><a title="Line 792: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 2816</a></td> <td class="src"><pre class="src"> <a title="Line 792: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (defaultConfig.containsKey(key) || noDefaultConfig.contains(key)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 792</td> <td class="nbHitsCovered"><a title="Line 792: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 2960</a></td> <td class="src"><pre class="src"> <a title="Line 792: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (defaultConfig.containsKey(key) || noDefaultConfig.contains(key)) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 793</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalStateException(<span class="string">"Key already added: "</span> + key);</pre></td></tr>
<tr> <td class="numLine"> 794</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 795</td> <td class="nbHitsCovered"><a title="Line 795: Conditional coverage 100% (2/2)."> 2814</a></td> <td class="src"><pre class="src"> <a title="Line 795: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (defaultValue == <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 796</td> <td class="nbHitsCovered"> 81</td> <td class="src"><pre class="src"> noDefaultConfig.add(key);</pre></td></tr>
+<tr> <td class="numLineCover"> 795</td> <td class="nbHitsCovered"><a title="Line 795: Conditional coverage 100% (2/2)."> 2958</a></td> <td class="src"><pre class="src"> <a title="Line 795: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (defaultValue == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 796</td> <td class="nbHitsCovered"> 85</td> <td class="src"><pre class="src"> noDefaultConfig.add(key);</pre></td></tr>
<tr> <td class="numLine"> 797</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 798</td> <td class="nbHitsCovered"> 2733</td> <td class="src"><pre class="src"> defaultConfig.setProperty(key, defaultValue);</pre></td></tr>
+<tr> <td class="numLineCover"> 798</td> <td class="nbHitsCovered"> 2873</td> <td class="src"><pre class="src"> defaultConfig.setProperty(key, defaultValue);</pre></td></tr>
<tr> <td class="numLine"> 799</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 800</td> <td class="nbHitsCovered"> 2814</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 800</td> <td class="nbHitsCovered"> 2958</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 801</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 802</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">synchronized</span> <span class="keyword">void</span> addKey(String key, String defaultValue,</pre></td></tr>
<tr> <td class="numLine"> 803</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> ValueComputer computer) {</pre></td></tr>
-<tr> <td class="numLineCover"> 804</td> <td class="nbHitsCovered"> 317</td> <td class="src"><pre class="src"> addKey(key, defaultValue);</pre></td></tr>
-<tr> <td class="numLineCover"> 805</td> <td class="nbHitsCovered"> 317</td> <td class="src"><pre class="src"> computeMap.put(key, computer);</pre></td></tr>
-<tr> <td class="numLineCover"> 806</td> <td class="nbHitsCovered"> 317</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 804</td> <td class="nbHitsCovered"> 333</td> <td class="src"><pre class="src"> addKey(key, defaultValue);</pre></td></tr>
+<tr> <td class="numLineCover"> 805</td> <td class="nbHitsCovered"> 333</td> <td class="src"><pre class="src"> computeMap.put(key, computer);</pre></td></tr>
+<tr> <td class="numLineCover"> 806</td> <td class="nbHitsCovered"> 333</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 807</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 808</td> <td class="nbHits"> </td>
@@ -1468,8 +1468,8 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 830</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">synchronized</span> <span class="keyword">void</span> setValue(String key, String value) {</pre></td></tr>
-<tr> <td class="numLineCover"> 831</td> <td class="nbHitsCovered"> 240</td> <td class="src"><pre class="src"> config.setProperty(key, value);</pre></td></tr>
-<tr> <td class="numLineCover"> 832</td> <td class="nbHitsCovered"> 240</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 831</td> <td class="nbHitsCovered"> 252</td> <td class="src"><pre class="src"> config.setProperty(key, value);</pre></td></tr>
+<tr> <td class="numLineCover"> 832</td> <td class="nbHitsCovered"> 252</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 833</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 834</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.DocId.html b/coverage/com.google.enterprise.adaptor.DocId.html
index 3de36a0..6aab168 100644
--- a/coverage/com.google.enterprise.adaptor.DocId.html
+++ b/coverage/com.google.enterprise.adaptor.DocId.html
@@ -90,13 +90,13 @@
<td class="src"><pre class="src"> <span class="comment"> * @param id non-{@code null} document identifier</span></pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 60458</td> <td class="src"><pre class="src"> <span class="keyword">public</span> DocId(String id) {</pre></td></tr>
-<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"><a title="Line 39: Conditional coverage 100% (2/2)."> 60458</a></td> <td class="src"><pre class="src"> <a title="Line 39: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (id == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 38</td> <td class="nbHitsCovered"> 60460</td> <td class="src"><pre class="src"> <span class="keyword">public</span> DocId(String id) {</pre></td></tr>
+<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"><a title="Line 39: Conditional coverage 100% (2/2)."> 60460</a></td> <td class="src"><pre class="src"> <a title="Line 39: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (id == <span class="keyword">null</span>) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 40</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException();</pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 60457</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.uniqId = id;</pre></td></tr>
-<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 60457</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 60459</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.uniqId = id;</pre></td></tr>
+<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 60459</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
@@ -133,12 +133,12 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object o) {</pre></td></tr>
-<tr> <td class="numLineCover"> 63</td> <td class="nbHitsCovered"><a title="Line 63: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 30212</a></td> <td class="src"><pre class="src"> <a title="Line 63: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (<span class="keyword">null</span> == o || !getClass().equals(o.getClass())) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 63</td> <td class="nbHitsCovered"><a title="Line 63: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 30213</a></td> <td class="src"><pre class="src"> <a title="Line 63: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (<span class="keyword">null</span> == o || !getClass().equals(o.getClass())) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 30210</td> <td class="src"><pre class="src"> DocId d = (DocId) o;</pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsCovered"> 30210</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.uniqId.equals(d.uniqId);</pre></td></tr>
+<tr> <td class="numLineCover"> 66</td> <td class="nbHitsCovered"> 30211</td> <td class="src"><pre class="src"> DocId d = (DocId) o;</pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsCovered"> 30211</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">this</span>.uniqId.equals(d.uniqId);</pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.DocIdSender.html b/coverage/com.google.enterprise.adaptor.DocIdSender.html
index 9f3d890..b8eff6e 100644
--- a/coverage/com.google.enterprise.adaptor.DocIdSender.html
+++ b/coverage/com.google.enterprise.adaptor.DocIdSender.html
@@ -12,9 +12,9 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="com.google.enterprise.adaptor.DocIdSender.html">DocIdSender</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">32</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:81px"><span class="text">144/176</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">12</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:77px"><span class="text">42/54</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.277777777777778;</span>4.278</td></tr>
- <tr><td><a href="com.google.enterprise.adaptor.DocIdSender.html">DocIdSender$AclItem</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">20/20</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">8</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:55px"><span class="text">10/18</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.277777777777778;</span>4.278</td></tr>
- <tr><td><a href="com.google.enterprise.adaptor.DocIdSender.html">DocIdSender$Item</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.277777777777778;</span>4.278</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.DocIdSender.html">DocIdSender</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">32</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:82px"><span class="text">150/182</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">12</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:79px"><span class="text">46/58</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.5;</span>4.5</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.DocIdSender.html">DocIdSender$AclItem</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">0</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:100px"><span class="text">20/20</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">8</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:55px"><span class="text">10/18</span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.5;</span>4.5</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.DocIdSender.html">DocIdSender$Item</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></td><td class="percentgraph"><div class="percentgraph"><div class="na" style="width:100px"><span class="text"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">N/A</a></span></div></div></td></tr></table></td><td class="value"><span class="hidden">4.5;</span>4.5</td></tr>
</table>
<div class="separator"> </div>
@@ -98,7 +98,7 @@
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Config config;</pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> Adaptor adaptor;</pre></td></tr>
-<tr> <td class="numLineCover"> 41</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> ExceptionHandler defaultErrorHandler</pre></td></tr>
+<tr> <td class="numLineCover"> 41</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> ExceptionHandler defaultErrorHandler</pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> = ExceptionHandlers.defaultHandler();</pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
@@ -107,14 +107,14 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> DocIdSender(GsaFeedFileMaker fileMaker, GsaFeedFileSender fileSender,</pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> FeedArchiver fileArchiver, Journal journal, Config config,</pre></td></tr>
-<tr> <td class="numLineCover"> 46</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> Adaptor adaptor) {</pre></td></tr>
-<tr> <td class="numLineCover"> 47</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.fileMaker = fileMaker;</pre></td></tr>
-<tr> <td class="numLineCover"> 48</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.fileSender = fileSender;</pre></td></tr>
-<tr> <td class="numLineCover"> 49</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.fileArchiver = fileArchiver;</pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.journal = journal;</pre></td></tr>
-<tr> <td class="numLineCover"> 51</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.config = config;</pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.adaptor = adaptor;</pre></td></tr>
-<tr> <td class="numLineCover"> 53</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 46</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> Adaptor adaptor) {</pre></td></tr>
+<tr> <td class="numLineCover"> 47</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.fileMaker = fileMaker;</pre></td></tr>
+<tr> <td class="numLineCover"> 48</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.fileSender = fileSender;</pre></td></tr>
+<tr> <td class="numLineCover"> 49</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.fileArchiver = fileArchiver;</pre></td></tr>
+<tr> <td class="numLineCover"> 50</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.journal = journal;</pre></td></tr>
+<tr> <td class="numLineCover"> 51</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.config = config;</pre></td></tr>
+<tr> <td class="numLineCover"> 52</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.adaptor = adaptor;</pre></td></tr>
+<tr> <td class="numLineCover"> 53</td> <td class="nbHitsCovered"> 39</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
@@ -250,448 +250,462 @@
<td class="src"><pre class="src"> ExceptionHandler handler)</pre></td></tr>
<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">throws</span> InterruptedException {</pre></td></tr>
-<tr> <td class="numLineCover"> 145</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> List<AclItem> acls = <span class="keyword">new</span> ArrayList<AclItem>(resources.size());</pre></td></tr>
-<tr> <td class="numLineCover"> 146</td> <td class="nbHitsCovered"><a title="Line 146: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 146: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Map.Entry<DocId, Acl> me : resources.entrySet()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 147</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> acls.add(<span class="keyword">new</span> AclItem(me.getKey(), me.getValue()));</pre></td></tr>
-<tr> <td class="numLine"> 148</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 145</td> <td class="nbHitsCovered"><a title="Line 145: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 145: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (config.markAllDocsAsPublic()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 146</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.finest(<span class="string">"Ignoring attempt to send ACLs to the GSA because "</span></pre></td></tr>
+<tr> <td class="numLine"> 147</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> + <span class="string">"markAllDocsAsPublic is true."</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 148</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 149</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 149</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.FINE, <span class="string">"about to push named resources: {0}"</span>, acls);</pre></td></tr>
-<tr> <td class="numLineCover"> 150</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> AclItem acl = pushItems(acls.iterator(), handler);</pre></td></tr>
-<tr> <td class="numLineCover"> 151</td> <td class="nbHitsCovered"><a title="Line 151: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 151: Conditional coverage 100% (2/2)."> DocId result = (acl == <span class="keyword">null</span>) ? <span class="keyword">null</span> : acl.getDocId();</a></pre></td></tr>
-<tr> <td class="numLineCover"> 152</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.FINE, <span class="string">"return value: {0}"</span>, result);</pre></td></tr>
-<tr> <td class="numLineCover"> 153</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> result;</pre></td></tr>
-<tr> <td class="numLine"> 154</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 150</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> List<AclItem> acls = <span class="keyword">new</span> ArrayList<AclItem>(resources.size());</pre></td></tr>
+<tr> <td class="numLineCover"> 151</td> <td class="nbHitsCovered"><a title="Line 151: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 151: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Map.Entry<DocId, Acl> me : resources.entrySet()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 152</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> acls.add(<span class="keyword">new</span> AclItem(me.getKey(), me.getValue()));</pre></td></tr>
+<tr> <td class="numLine"> 153</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 154</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.FINE, <span class="string">"about to push named resources: {0}"</span>, acls);</pre></td></tr>
+<tr> <td class="numLineCover"> 155</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> AclItem acl = pushItems(acls.iterator(), handler);</pre></td></tr>
+<tr> <td class="numLineCover"> 156</td> <td class="nbHitsCovered"><a title="Line 156: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 156: Conditional coverage 100% (2/2)."> DocId result = (acl == <span class="keyword">null</span>) ? <span class="keyword">null</span> : acl.getDocId();</a></pre></td></tr>
+<tr> <td class="numLineCover"> 157</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.FINE, <span class="string">"return value: {0}"</span>, result);</pre></td></tr>
+<tr> <td class="numLineCover"> 158</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> result;</pre></td></tr>
+<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 155</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 156</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 157</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <T <span class="keyword">extends</span> Item> T pushItems(Iterator<T> items,</pre></td></tr>
-<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> ExceptionHandler handler) <span class="keyword">throws</span> InterruptedException {</pre></td></tr>
-<tr> <td class="numLineCover"> 159</td> <td class="nbHitsCovered"> 21</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"Pushing items"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 160</td> <td class="nbHitsCovered"><a title="Line 160: Conditional coverage 100% (2/2)."> 21</a></td> <td class="src"><pre class="src"> <a title="Line 160: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (handler == <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 161</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> handler = defaultErrorHandler;</pre></td></tr>
<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <T <span class="keyword">extends</span> Item> T pushItems(Iterator<T> items,</pre></td></tr>
+<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> ExceptionHandler handler) <span class="keyword">throws</span> InterruptedException {</pre></td></tr>
+<tr> <td class="numLineCover"> 164</td> <td class="nbHitsCovered"> 21</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"Pushing items"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 165</td> <td class="nbHitsCovered"><a title="Line 165: Conditional coverage 100% (2/2)."> 21</a></td> <td class="src"><pre class="src"> <a title="Line 165: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (handler == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 166</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> handler = defaultErrorHandler;</pre></td></tr>
+<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 163</td> <td class="nbHitsCovered"> 21</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> firstBatch = <span class="keyword">true</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 164</td> <td class="nbHitsCovered"> 21</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">int</span> max = config.getFeedMaxUrls();</pre></td></tr>
-<tr> <td class="numLineCover"> 165</td> <td class="nbHitsCovered"><a title="Line 165: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 165: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (items.hasNext()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 166</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> List<T> batch = <span class="keyword">new</span> ArrayList<T>();</pre></td></tr>
-<tr> <td class="numLineCover"> 167</td> <td class="nbHitsCovered"><a title="Line 167: Conditional coverage 100% (2/2)."> 24</a></td> <td class="src"><pre class="src"> <a title="Line 167: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> j = 0; j < max; j++) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 168</td> <td class="nbHitsCovered"><a title="Line 168: Conditional coverage 100% (2/2)."> 20</a></td> <td class="src"><pre class="src"> <a title="Line 168: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!items.hasNext()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 169</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
-<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> batch.add(items.next());</pre></td></tr>
-<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 173</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"Pushing group of {0} items"</span>, batch.size());</pre></td></tr>
-<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> T failedId;</pre></td></tr>
+<tr> <td class="numLineCover"> 168</td> <td class="nbHitsCovered"> 21</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> firstBatch = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 169</td> <td class="nbHitsCovered"> 21</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">int</span> max = config.getFeedMaxUrls();</pre></td></tr>
+<tr> <td class="numLineCover"> 170</td> <td class="nbHitsCovered"><a title="Line 170: Conditional coverage 100% (2/2)."> 27</a></td> <td class="src"><pre class="src"> <a title="Line 170: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (items.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 171</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> List<T> batch = <span class="keyword">new</span> ArrayList<T>();</pre></td></tr>
+<tr> <td class="numLineCover"> 172</td> <td class="nbHitsCovered"><a title="Line 172: Conditional coverage 100% (2/2)."> 24</a></td> <td class="src"><pre class="src"> <a title="Line 172: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> j = 0; j < max; j++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 173</td> <td class="nbHitsCovered"><a title="Line 173: Conditional coverage 100% (2/2)."> 20</a></td> <td class="src"><pre class="src"> <a title="Line 173: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!items.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 174</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 176</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> failedId = pushSizedBatchOfItems(batch, handler);</pre></td></tr>
-<tr> <td class="numLineCover"> 177</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (InterruptedException ex) {</pre></td></tr>
-<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"><a title="Line 178: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 178: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (firstBatch) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 179</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> ex;</pre></td></tr>
-<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// If this is not the first batch, then some items have already been</span></pre></td></tr>
-<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// sent. Thus, return gracefully instead of throwing an exception so</span></pre></td></tr>
-<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// that the caller can discover what was sent.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 184</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"Pushing items interrupted"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 185</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> Thread.currentThread().interrupt();</pre></td></tr>
-<tr> <td class="numLineCover"> 186</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> batch.get(0);</pre></td></tr>
-<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 188</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"><a title="Line 189: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 189: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (failedId != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 190</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"Failed to push all items. Failed on: {0}"</span>,</pre></td></tr>
-<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> failedId);</pre></td></tr>
-<tr> <td class="numLineCover"> 192</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> failedId;</pre></td></tr>
-<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 176</td> <td class="nbHitsCovered"> 14</td> <td class="src"><pre class="src"> batch.add(items.next());</pre></td></tr>
+<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 194</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> firstBatch = <span class="keyword">false</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 195</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> journal.recordDocIdPush(batch);</pre></td></tr>
-<tr> <td class="numLineCover"> 196</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> log.info(<span class="string">"Pushed items"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> GroupPrincipal pushGroupDefinitions(</pre></td></tr>
-<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> Map<GroupPrincipal, ? <span class="keyword">extends</span> Collection<Principal>> defs,</pre></td></tr>
-<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">boolean</span> caseSensitive, ExceptionHandler handler) </pre></td></tr>
+<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"Pushing group of {0} items"</span>, batch.size());</pre></td></tr>
+<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> T failedId;</pre></td></tr>
+<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 181</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> failedId = pushSizedBatchOfItems(batch, handler);</pre></td></tr>
+<tr> <td class="numLineCover"> 182</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (InterruptedException ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 183</td> <td class="nbHitsCovered"><a title="Line 183: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 183: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (firstBatch) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 184</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> ex;</pre></td></tr>
+<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// If this is not the first batch, then some items have already been</span></pre></td></tr>
+<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// sent. Thus, return gracefully instead of throwing an exception so</span></pre></td></tr>
+<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// that the caller can discover what was sent.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"Pushing items interrupted"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 190</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> Thread.currentThread().interrupt();</pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> batch.get(0);</pre></td></tr>
+<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 193</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 194</td> <td class="nbHitsCovered"><a title="Line 194: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 194: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (failedId != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 195</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"Failed to push all items. Failed on: {0}"</span>,</pre></td></tr>
+<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> failedId);</pre></td></tr>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> failedId;</pre></td></tr>
+<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> firstBatch = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 200</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> journal.recordDocIdPush(batch);</pre></td></tr>
+<tr> <td class="numLineCover"> 201</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> log.info(<span class="string">"Pushed items"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">throws</span> InterruptedException {</pre></td></tr>
-<tr> <td class="numLineCover"> 205</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> pushGroupDefinitionsInternal(defs, caseSensitive, handler);</pre></td></tr>
-<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> GroupPrincipal pushGroupDefinitions(</pre></td></tr>
+<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> Map<GroupPrincipal, ? <span class="keyword">extends</span> Collection<Principal>> defs,</pre></td></tr>
<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/*</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">boolean</span> caseSensitive, ExceptionHandler handler) </pre></td></tr>
<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Internal version of pushGroupDefinitions() to add the parameterized generic</span></pre></td></tr>
-<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * T. We need the parameter to be able to create a List and add Map.Entries to</span></pre></td></tr>
-<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * that list.</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="keyword">throws</span> InterruptedException {</pre></td></tr>
+<tr> <td class="numLineCover"> 210</td> <td class="nbHitsCovered"><a title="Line 210: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 210: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (config.markAllDocsAsPublic()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 211</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.finest(<span class="string">"Ignoring attempt to send groups to the GSA because "</span></pre></td></tr>
<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
-<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Unfortunately, due to a limitation in Java (which is still present in</span></pre></td></tr>
+ <td class="src"><pre class="src"> + <span class="string">"markAllDocsAsPublic is true."</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 213</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Java 7), the generics in the methods this one calls are forced to be</span></pre></td></tr>
-<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * parameterized even though it should be unnecessary. Fortunately, our API</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 215</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> pushGroupDefinitionsInternal(defs, caseSensitive, handler);</pre></td></tr>
<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * does not trigger this issue; it is only internal code that suffers.</span></pre></td></tr>
+ <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * As an example test, these generics work fine:</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment">/*</span></pre></td></tr>
<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * private void method1(List<?> args) {</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Internal version of pushGroupDefinitions() to add the parameterized generic</span></pre></td></tr>
<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * method2(args);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * T. We need the parameter to be able to create a List and add Map.Entries to</span></pre></td></tr>
<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * that list.</span></pre></td></tr>
<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * private <T> void method2(List<T> args) {</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Unfortunately, due to a limitation in Java (which is still present in</span></pre></td></tr>
<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * method1(args);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * Java 7), the generics in the methods this one calls are forced to be</span></pre></td></tr>
<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * parameterized even though it should be unnecessary. Fortunately, our API</span></pre></td></tr>
<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * does not trigger this issue; it is only internal code that suffers.</span></pre></td></tr>
<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Whereas these both fail to find the other method:</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * private void method3(List<List<?>> args) {</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * As an example test, these generics work fine:</span></pre></td></tr>
<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * method4(args);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * private void method1(List<?> args) {</span></pre></td></tr>
<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * method2(args);</span></pre></td></tr>
<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * }</span></pre></td></tr>
<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * private <T> void method4(List<List<T>> args) {</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * method3(args);</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * private <T> void method2(List<T> args) {</span></pre></td></tr>
<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * }</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * method1(args);</span></pre></td></tr>
<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * }</span></pre></td></tr>
<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * And so having any container of Map.Entry breaks mixing of parameterized</span></pre></td></tr>
-<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * and wildcard generic types.</span></pre></td></tr>
-<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Whereas these both fail to find the other method:</span></pre></td></tr>
+<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * private void method3(List<List<?>> args) {</span></pre></td></tr>
<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Luckily when mixed with concrete types it is only half broken:</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * method4(args);</span></pre></td></tr>
<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * List<List<Object>> l = null;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * }</span></pre></td></tr>
<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * method3(l); // Fails</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * method4(l); // Compiles</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * private <T> void method4(List<List<T>> args) {</span></pre></td></tr>
<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * method3(args);</span></pre></td></tr>
<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <T <span class="keyword">extends</span> Collection<Principal>> GroupPrincipal</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * }</span></pre></td></tr>
<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> pushGroupDefinitionsInternal(</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
<tr> <td class="numLine"> 246</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> Map<GroupPrincipal, T> defs,</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * And so having any container of Map.Entry breaks mixing of parameterized</span></pre></td></tr>
<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">boolean</span> caseSensitive, ExceptionHandler handler)</pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> * and wildcard generic types.</span></pre></td></tr>
<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">throws</span> InterruptedException {</pre></td></tr>
-<tr> <td class="numLineCover"> 249</td> <td class="nbHitsUncovered"><a title="Line 249: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 249: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (defs.isEmpty()) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 250</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+ <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr>
+<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Luckily when mixed with concrete types it is only half broken:</span></pre></td></tr>
+<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * List<List<Object>> l = null;</span></pre></td></tr>
<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 252</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> String gsaVerString = config.getGsaVersion();</pre></td></tr>
-<tr> <td class="numLineCover"> 253</td> <td class="nbHitsUncovered"><a title="Line 253: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 253: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!<span class="keyword">new</span> GsaVersion(gsaVerString).isAtLeast(<span class="string">"7.2.0-0"</span>)) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 254</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.WARNING,</span></pre></td></tr>
-<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="string">"GSA ver {0} doesn't accept group definitions"</span>, gsaVerString);</pre></td></tr>
-<tr> <td class="numLineCover"> 256</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> defs.entrySet().iterator().next().getKey();</span></pre></td></tr>
-<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 258</td> <td class="nbHitsUncovered"><a title="Line 258: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 258: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="keyword">null</span> == handler) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 259</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> handler = defaultErrorHandler;</pre></td></tr>
-<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 261</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> firstBatch = <span class="keyword">true</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 262</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">int</span> max = config.getFeedMaxUrls();</pre></td></tr>
-<tr> <td class="numLineCover"> 263</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> Iterator<Map.Entry<GroupPrincipal, T>> defsIterator</pre></td></tr>
-<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = defs.entrySet().iterator();</pre></td></tr>
-<tr> <td class="numLineCover"> 265</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> List<Map.Entry<GroupPrincipal, T>> batch</pre></td></tr>
-<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = <span class="keyword">new</span> ArrayList<Map.Entry<GroupPrincipal, T>>();</pre></td></tr>
-<tr> <td class="numLineCover"> 267</td> <td class="nbHitsCovered"><a title="Line 267: Conditional coverage 100% (2/2)."> 3</a></td> <td class="src"><pre class="src"> <a title="Line 267: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (defsIterator.hasNext()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 268</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> batch.clear();</pre></td></tr>
-<tr> <td class="numLineCover"> 269</td> <td class="nbHitsCovered"><a title="Line 269: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 269: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> j = 0; j < max; j++) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 270</td> <td class="nbHitsCovered"><a title="Line 270: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 270: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!defsIterator.hasNext()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 271</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
-<tr> <td class="numLine"> 272</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 273</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> batch.add(defsIterator.next());</pre></td></tr>
-<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 275</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"Pushing batch of {0} groups"</span>, batch.size());</pre></td></tr>
-<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> GroupPrincipal failedId;</pre></td></tr>
-<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 278</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> failedId = pushSizedBatchOfGroups(batch, caseSensitive, handler);</pre></td></tr>
-<tr> <td class="numLineCover"> 279</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 280</td> <td class="nbHitsUncovered"><a title="Line 280: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 280: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (firstBatch) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 281</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> ex;</span></pre></td></tr>
-<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// If this is not the first batch, then some items have already been</span></pre></td></tr>
-<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// sent. Thus, return gracefully instead of throwing an exception so</span></pre></td></tr>
-<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">// that the caller can discover what was sent.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 286</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.INFO, <span class="string">"Pushing items interrupted"</span>);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 287</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Thread.currentThread().interrupt();</span></pre></td></tr>
-<tr> <td class="numLineCover"> 288</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> batch.get(0).getKey();</span></pre></td></tr>
-<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 290</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"><a title="Line 291: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 291: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (failedId != <span class="keyword">null</span>) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.INFO, <span class="string">"Failed to push all groups. Failed on: {0}"</span>,</span></pre></td></tr>
-<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> failedId);</pre></td></tr>
-<tr> <td class="numLineCover"> 294</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> failedId;</span></pre></td></tr>
-<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 296</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> firstBatch = <span class="keyword">false</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 297</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 298</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.info(<span class="string">"Pushed groups"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 299</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 302</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <T <span class="keyword">extends</span> Collection<Principal>> GroupPrincipal</pre></td></tr>
-<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> pushSizedBatchOfGroups(</pre></td></tr>
-<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> List<Map.Entry<GroupPrincipal, T>> defs,</pre></td></tr>
-<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">boolean</span> caseSensitive, ExceptionHandler handler)</pre></td></tr>
-<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">throws</span> InterruptedException {</pre></td></tr>
-<tr> <td class="numLineCover"> 307</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> String feedSourceName = config.getFeedName();</pre></td></tr>
-<tr> <td class="numLineCover"> 308</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> String groupsDefXml</pre></td></tr>
-<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> = fileMaker.makeGroupDefinitionsXml(defs, caseSensitive);</pre></td></tr>
-<tr> <td class="numLineCover"> 310</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> keepGoing = <span class="keyword">true</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 311</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> success = <span class="keyword">false</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 312</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"pushing groups"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 313</td> <td class="nbHitsCovered"><a title="Line 313: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 313: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> ntries = 1; keepGoing; ntries++) {</a></pre></td></tr>
-<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 315</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.info(<span class="string">"sending groups to GSA host name: "</span> + config.getGsaHostname());</pre></td></tr>
-<tr> <td class="numLineCover"> 316</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> fileSender.sendGroups(feedSourceName,</pre></td></tr>
-<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> groupsDefXml, config.isServerToUseCompression());</pre></td></tr>
-<tr> <td class="numLineCover"> 318</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> keepGoing = <span class="keyword">false</span>; <span class="comment">// Sent.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 319</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> success = <span class="keyword">true</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 320</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
-<tr> <td class="numLineCover"> 321</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.WARNING, <span class="string">"failed to send groups"</span>, ex);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 322</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> keepGoing = handler.handleException(ex, ntries);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 323</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 324</td> <td class="nbHitsUncovered"><a title="Line 324: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 324: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (keepGoing) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 325</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.INFO, <span class="string">"trying again... number of attemps: {0}"</span>, ntries);</span></pre></td></tr>
-<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 328</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> GroupPrincipal last = <span class="keyword">null</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 329</td> <td class="nbHitsUncovered"><a title="Line 329: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 329: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (success) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 330</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.info(<span class="string">"pushing groups batch succeeded"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 331</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> fileArchiver.saveFeed(feedSourceName, groupsDefXml);</pre></td></tr>
-<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 333</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> last = defs.get(0).getKey(); <span class="comment">// checked in pushGroupDefinitionsInternal()</span></span></pre></td></tr>
-<tr> <td class="numLineCover"> 334</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.WARNING, <span class="string">"gave up pushing groups. First item: {0}"</span>, last);</span></pre></td></tr>
-<tr> <td class="numLineCover"> 335</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fileArchiver.saveFailedFeed(feedSourceName, groupsDefXml);</span></pre></td></tr>
-<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 337</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.info(<span class="string">"finished pushing batch of groups"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 338</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> last;</pre></td></tr>
-<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <T <span class="keyword">extends</span> Item> T pushSizedBatchOfItems(List<T> items,</pre></td></tr>
-<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> ExceptionHandler handler)</pre></td></tr>
-<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">throws</span> InterruptedException {</pre></td></tr>
-<tr> <td class="numLineCover"> 345</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> String feedSourceName = config.getFeedName();</pre></td></tr>
-<tr> <td class="numLineCover"> 346</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> String xmlFeedFile = fileMaker.makeMetadataAndUrlXml(feedSourceName, items);</pre></td></tr>
-<tr> <td class="numLineCover"> 347</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> keepGoing = <span class="keyword">true</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 348</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> success = <span class="keyword">false</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 349</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"Pushing batch of {0} items to GSA"</span>, items.size());</pre></td></tr>
-<tr> <td class="numLineCover"> 350</td> <td class="nbHitsCovered"><a title="Line 350: Conditional coverage 100% (2/2)."> 18</a></td> <td class="src"><pre class="src"> <a title="Line 350: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> ntries = 1; keepGoing; ntries++) {</a></pre></td></tr>
-<tr> <td class="numLine"> 351</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 352</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> log.info(<span class="string">"Sending items to GSA host: "</span> + config.getGsaHostname());</pre></td></tr>
-<tr> <td class="numLineCover"> 353</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> fileSender.sendMetadataAndUrl(feedSourceName, xmlFeedFile,</pre></td></tr>
-<tr> <td class="numLine"> 354</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> config.isServerToUseCompression());</pre></td></tr>
-<tr> <td class="numLineCover"> 355</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> keepGoing = <span class="keyword">false</span>; <span class="comment">// Sent.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 356</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> success = <span class="keyword">true</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 357</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (IOException ex) {</pre></td></tr>
-<tr> <td class="numLineCover"> 358</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Failed to send items"</span>, ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 359</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> keepGoing = handler.handleException(ex, ntries);</pre></td></tr>
-<tr> <td class="numLineCover"> 360</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 361</td> <td class="nbHitsUncovered"><a title="Line 361: Conditional coverage 50% (1/2)."> 8</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 361: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (keepGoing) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 362</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.INFO, <span class="string">"Trying again... Number of attemps: {0}"</span>, ntries);</span></pre></td></tr>
-<tr> <td class="numLine"> 363</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 364</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 365</td> <td class="nbHitsCovered"><a title="Line 365: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 365: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (success) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 366</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> log.info(<span class="string">"Pushing batch succeeded"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 367</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> fileArchiver.saveFeed(feedSourceName, xmlFeedFile);</pre></td></tr>
-<tr> <td class="numLine"> 368</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 369</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Gave up. First item in list: {0}"</span>, items.get(0));</pre></td></tr>
-<tr> <td class="numLineCover"> 370</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> fileArchiver.saveFailedFeed(feedSourceName, xmlFeedFile);</pre></td></tr>
-<tr> <td class="numLine"> 371</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 372</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> log.info(<span class="string">"Finished pushing batch of items"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 373</td> <td class="nbHitsCovered"><a title="Line 373: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 373: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> success ? <span class="keyword">null</span> : items.get(0);</a></pre></td></tr>
-<tr> <td class="numLine"> 374</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 375</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 376</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/** Marker interface for an item that can exist in a feed. */</span></pre></td></tr>
-<tr> <td class="numLine"> 377</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">interface</span> Item {}</pre></td></tr>
-<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 379</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
-<tr> <td class="numLine"> 380</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="comment"> * Represents the ACL tag sent in feeds.</span></pre></td></tr>
-<tr> <td class="numLine"> 381</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * method3(l); // Fails</span></pre></td></tr>
+<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * method4(l); // Compiles</span></pre></td></tr>
+<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLine"> 382</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">class</span> AclItem <span class="keyword">implements</span> Item {</pre></td></tr>
-<tr> <td class="numLine"> 383</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> DocId id;</pre></td></tr>
-<tr> <td class="numLine"> 384</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> String docIdFragment;</pre></td></tr>
-<tr> <td class="numLine"> 385</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">private</span> Acl acl;</pre></td></tr>
-<tr> <td class="numLine"> 386</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 387</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> AclItem(DocId id, Acl acl) {</pre></td></tr>
-<tr> <td class="numLineCover"> 388</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(id, <span class="keyword">null</span>, acl);</pre></td></tr>
-<tr> <td class="numLineCover"> 389</td> <td class="nbHitsCovered"> 9</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 390</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 391</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">public</span> AclItem(DocId id, String docIdFragment, Acl acl) {</pre></td></tr>
-<tr> <td class="numLineCover"> 392</td> <td class="nbHitsCovered"><a title="Line 392: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 18</a></td> <td class="src"><pre class="src"> <a title="Line 392: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (id == <span class="keyword">null</span> || acl == <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 393</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException(<span class="string">"DocId and Acl must not be null"</span>);</pre></td></tr>
-<tr> <td class="numLine"> 394</td> <td class="nbHits"> </td>
+<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <T <span class="keyword">extends</span> Collection<Principal>> GroupPrincipal</pre></td></tr>
+<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> pushGroupDefinitionsInternal(</pre></td></tr>
+<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> Map<GroupPrincipal, T> defs,</pre></td></tr>
+<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">boolean</span> caseSensitive, ExceptionHandler handler)</pre></td></tr>
+<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">throws</span> InterruptedException {</pre></td></tr>
+<tr> <td class="numLineCover"> 259</td> <td class="nbHitsUncovered"><a title="Line 259: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 259: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (defs.isEmpty()) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 260</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">null</span>;</span></pre></td></tr>
+<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 262</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> String gsaVerString = config.getGsaVersion();</pre></td></tr>
+<tr> <td class="numLineCover"> 263</td> <td class="nbHitsUncovered"><a title="Line 263: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 263: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!<span class="keyword">new</span> GsaVersion(gsaVerString).isAtLeast(<span class="string">"7.2.0-0"</span>)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 264</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.WARNING,</span></pre></td></tr>
+<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="string">"GSA ver {0} doesn't accept group definitions"</span>, gsaVerString);</pre></td></tr>
+<tr> <td class="numLineCover"> 266</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> defs.entrySet().iterator().next().getKey();</span></pre></td></tr>
+<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 268</td> <td class="nbHitsUncovered"><a title="Line 268: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 268: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="keyword">null</span> == handler) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 269</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> handler = defaultErrorHandler;</pre></td></tr>
+<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 271</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> firstBatch = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 272</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">final</span> <span class="keyword">int</span> max = config.getFeedMaxUrls();</pre></td></tr>
+<tr> <td class="numLineCover"> 273</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> Iterator<Map.Entry<GroupPrincipal, T>> defsIterator</pre></td></tr>
+<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> = defs.entrySet().iterator();</pre></td></tr>
+<tr> <td class="numLineCover"> 275</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> List<Map.Entry<GroupPrincipal, T>> batch</pre></td></tr>
+<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> = <span class="keyword">new</span> ArrayList<Map.Entry<GroupPrincipal, T>>();</pre></td></tr>
+<tr> <td class="numLineCover"> 277</td> <td class="nbHitsCovered"><a title="Line 277: Conditional coverage 100% (2/2)."> 3</a></td> <td class="src"><pre class="src"> <a title="Line 277: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (defsIterator.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 278</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> batch.clear();</pre></td></tr>
+<tr> <td class="numLineCover"> 279</td> <td class="nbHitsCovered"><a title="Line 279: Conditional coverage 100% (2/2)."> 5</a></td> <td class="src"><pre class="src"> <a title="Line 279: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> j = 0; j < max; j++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 280</td> <td class="nbHitsCovered"><a title="Line 280: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 280: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!defsIterator.hasNext()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 281</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">break</span>;</pre></td></tr>
+<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 283</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> batch.add(defsIterator.next());</pre></td></tr>
+<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 395</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.id = id;</pre></td></tr>
-<tr> <td class="numLineCover"> 396</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.docIdFragment = docIdFragment;</pre></td></tr>
-<tr> <td class="numLineCover"> 397</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.acl = acl;</pre></td></tr>
-<tr> <td class="numLineCover"> 398</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 399</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 400</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> DocId getDocId() {</pre></td></tr>
-<tr> <td class="numLineCover"> 401</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">return</span> id;</pre></td></tr>
-<tr> <td class="numLine"> 402</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 403</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 404</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String getDocIdFragment() {</pre></td></tr>
-<tr> <td class="numLineCover"> 405</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> docIdFragment;</pre></td></tr>
-<tr> <td class="numLine"> 406</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 407</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 408</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> Acl getAcl() {</pre></td></tr>
-<tr> <td class="numLineCover"> 409</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> acl;</pre></td></tr>
-<tr> <td class="numLine"> 410</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 411</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 412</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 413</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object o) {</pre></td></tr>
-<tr> <td class="numLineCover"> 414</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> same = <span class="keyword">false</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 415</td> <td class="nbHitsUncovered"><a title="Line 415: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 415: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (<span class="keyword">null</span> != o && <span class="keyword">this</span>.getClass().equals(o.getClass())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 416</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> AclItem other = (AclItem) o;</pre></td></tr>
-<tr> <td class="numLineCover"> 417</td> <td class="nbHitsUncovered"><a title="Line 417: Conditional coverage 40% (4/10) [each condition: 50%, 50%, 50%, 50%, 0%]."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 417: Conditional coverage 40% (4/10) [each condition: 50%, 50%, 50%, 50%, 0%]."> same = id.equals(other.id) && acl.equals(other.acl)</a></span></pre></td></tr>
-<tr> <td class="numLine"> 418</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> && (docIdFragment == <span class="keyword">null</span> ? other.docIdFragment == <span class="keyword">null</span> :</pre></td></tr>
-<tr> <td class="numLine"> 419</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> docIdFragment.equals(other.docIdFragment));</pre></td></tr>
-<tr> <td class="numLine"> 420</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 285</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"Pushing batch of {0} groups"</span>, batch.size());</pre></td></tr>
+<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> GroupPrincipal failedId;</pre></td></tr>
+<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 288</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> failedId = pushSizedBatchOfGroups(batch, caseSensitive, handler);</pre></td></tr>
+<tr> <td class="numLineCover"> 289</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (InterruptedException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 290</td> <td class="nbHitsUncovered"><a title="Line 290: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 290: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (firstBatch) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 291</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> ex;</span></pre></td></tr>
+<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// If this is not the first batch, then some items have already been</span></pre></td></tr>
+<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// sent. Thus, return gracefully instead of throwing an exception so</span></pre></td></tr>
+<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">// that the caller can discover what was sent.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 296</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.INFO, <span class="string">"Pushing items interrupted"</span>);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 297</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> Thread.currentThread().interrupt();</span></pre></td></tr>
+<tr> <td class="numLineCover"> 298</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> batch.get(0).getKey();</span></pre></td></tr>
+<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 300</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 301</td> <td class="nbHitsUncovered"><a title="Line 301: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 301: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (failedId != <span class="keyword">null</span>) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 302</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.INFO, <span class="string">"Failed to push all groups. Failed on: {0}"</span>,</span></pre></td></tr>
+<tr> <td class="numLine"> 303</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> failedId);</pre></td></tr>
+<tr> <td class="numLineCover"> 304</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> failedId;</span></pre></td></tr>
+<tr> <td class="numLine"> 305</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 421</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> same;</pre></td></tr>
-<tr> <td class="numLine"> 422</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 423</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 424</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override</pre></td></tr>
-<tr> <td class="numLine"> 425</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
-<tr> <td class="numLineCover"> 426</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> Object members[] = <span class="keyword">new</span> Object[] { id, acl, docIdFragment };</pre></td></tr>
-<tr> <td class="numLineCover"> 427</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Arrays.hashCode(members);</pre></td></tr>
-<tr> <td class="numLine"> 428</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 429</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLine"> 430</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> @Override </pre></td></tr>
-<tr> <td class="numLine"> 431</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
-<tr> <td class="numLineCover"> 432</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="string">"AclItem("</span> + id + <span class="string">","</span> + docIdFragment + <span class="string">","</span> + acl + <span class="string">")"</span>;</pre></td></tr>
-<tr> <td class="numLine"> 433</td> <td class="nbHits"> </td>
- <td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLine"> 434</td> <td class="nbHits"> </td>
+<tr> <td class="numLineCover"> 306</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> firstBatch = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 307</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 308</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.info(<span class="string">"Pushed groups"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 309</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <T <span class="keyword">extends</span> Collection<Principal>> GroupPrincipal</pre></td></tr>
+<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> pushSizedBatchOfGroups(</pre></td></tr>
+<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> List<Map.Entry<GroupPrincipal, T>> defs,</pre></td></tr>
+<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">boolean</span> caseSensitive, ExceptionHandler handler)</pre></td></tr>
+<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">throws</span> InterruptedException {</pre></td></tr>
+<tr> <td class="numLineCover"> 317</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> String feedSourceName = config.getFeedName();</pre></td></tr>
+<tr> <td class="numLineCover"> 318</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> String groupsDefXml</pre></td></tr>
+<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> = fileMaker.makeGroupDefinitionsXml(defs, caseSensitive);</pre></td></tr>
+<tr> <td class="numLineCover"> 320</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> keepGoing = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 321</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> success = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 322</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"pushing groups"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 323</td> <td class="nbHitsCovered"><a title="Line 323: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 323: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> ntries = 1; keepGoing; ntries++) {</a></pre></td></tr>
+<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 325</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.info(<span class="string">"sending groups to GSA host name: "</span> + config.getGsaHostname());</pre></td></tr>
+<tr> <td class="numLineCover"> 326</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> fileSender.sendGroups(feedSourceName,</pre></td></tr>
+<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> groupsDefXml, config.isServerToUseCompression());</pre></td></tr>
+<tr> <td class="numLineCover"> 328</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> keepGoing = <span class="keyword">false</span>; <span class="comment">// Sent.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 329</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> success = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 330</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException ex) {</span></pre></td></tr>
+<tr> <td class="numLineCover"> 331</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.WARNING, <span class="string">"failed to send groups"</span>, ex);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 332</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> keepGoing = handler.handleException(ex, ntries);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 333</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 334</td> <td class="nbHitsUncovered"><a title="Line 334: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 334: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (keepGoing) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 335</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.INFO, <span class="string">"trying again... number of attemps: {0}"</span>, ntries);</span></pre></td></tr>
+<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 338</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> GroupPrincipal last = <span class="keyword">null</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 339</td> <td class="nbHitsUncovered"><a title="Line 339: Conditional coverage 50% (1/2)."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 339: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (success) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 340</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.info(<span class="string">"pushing groups batch succeeded"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 341</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> fileArchiver.saveFeed(feedSourceName, groupsDefXml);</pre></td></tr>
+<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 343</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> last = defs.get(0).getKey(); <span class="comment">// checked in pushGroupDefinitionsInternal()</span></span></pre></td></tr>
+<tr> <td class="numLineCover"> 344</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.WARNING, <span class="string">"gave up pushing groups. First item: {0}"</span>, last);</span></pre></td></tr>
+<tr> <td class="numLineCover"> 345</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fileArchiver.saveFailedFeed(feedSourceName, groupsDefXml);</span></pre></td></tr>
+<tr> <td class="numLine"> 346</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 347</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.info(<span class="string">"finished pushing batch of groups"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 348</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> last;</pre></td></tr>
+<tr> <td class="numLine"> 349</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 350</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 351</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 352</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <T <span class="keyword">extends</span> Item> T pushSizedBatchOfItems(List<T> items,</pre></td></tr>
+<tr> <td class="numLine"> 353</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> ExceptionHandler handler)</pre></td></tr>
+<tr> <td class="numLine"> 354</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">throws</span> InterruptedException {</pre></td></tr>
+<tr> <td class="numLineCover"> 355</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> String feedSourceName = config.getFeedName();</pre></td></tr>
+<tr> <td class="numLineCover"> 356</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> String xmlFeedFile = fileMaker.makeMetadataAndUrlXml(feedSourceName, items);</pre></td></tr>
+<tr> <td class="numLineCover"> 357</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> keepGoing = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 358</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> success = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 359</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> log.log(Level.INFO, <span class="string">"Pushing batch of {0} items to GSA"</span>, items.size());</pre></td></tr>
+<tr> <td class="numLineCover"> 360</td> <td class="nbHitsCovered"><a title="Line 360: Conditional coverage 100% (2/2)."> 18</a></td> <td class="src"><pre class="src"> <a title="Line 360: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> ntries = 1; keepGoing; ntries++) {</a></pre></td></tr>
+<tr> <td class="numLine"> 361</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 362</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> log.info(<span class="string">"Sending items to GSA host: "</span> + config.getGsaHostname());</pre></td></tr>
+<tr> <td class="numLineCover"> 363</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> fileSender.sendMetadataAndUrl(feedSourceName, xmlFeedFile,</pre></td></tr>
+<tr> <td class="numLine"> 364</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> config.isServerToUseCompression());</pre></td></tr>
+<tr> <td class="numLineCover"> 365</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> keepGoing = <span class="keyword">false</span>; <span class="comment">// Sent.</span></pre></td></tr>
+<tr> <td class="numLineCover"> 366</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> success = <span class="keyword">true</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 367</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (IOException ex) {</pre></td></tr>
+<tr> <td class="numLineCover"> 368</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Failed to send items"</span>, ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 369</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> keepGoing = handler.handleException(ex, ntries);</pre></td></tr>
+<tr> <td class="numLineCover"> 370</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 371</td> <td class="nbHitsUncovered"><a title="Line 371: Conditional coverage 50% (1/2)."> 8</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 371: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (keepGoing) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 372</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.INFO, <span class="string">"Trying again... Number of attemps: {0}"</span>, ntries);</span></pre></td></tr>
+<tr> <td class="numLine"> 373</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 374</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 375</td> <td class="nbHitsCovered"><a title="Line 375: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 375: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (success) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 376</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> log.info(<span class="string">"Pushing batch succeeded"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 377</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> fileArchiver.saveFeed(feedSourceName, xmlFeedFile);</pre></td></tr>
+<tr> <td class="numLine"> 378</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
+<tr> <td class="numLineCover"> 379</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Gave up. First item in list: {0}"</span>, items.get(0));</pre></td></tr>
+<tr> <td class="numLineCover"> 380</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> fileArchiver.saveFailedFeed(feedSourceName, xmlFeedFile);</pre></td></tr>
+<tr> <td class="numLine"> 381</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 382</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> log.info(<span class="string">"Finished pushing batch of items"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 383</td> <td class="nbHitsCovered"><a title="Line 383: Conditional coverage 100% (2/2)."> 8</a></td> <td class="src"><pre class="src"> <a title="Line 383: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> success ? <span class="keyword">null</span> : items.get(0);</a></pre></td></tr>
+<tr> <td class="numLine"> 384</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 385</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 386</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/** Marker interface for an item that can exist in a feed. */</span></pre></td></tr>
+<tr> <td class="numLine"> 387</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">interface</span> Item {}</pre></td></tr>
+<tr> <td class="numLine"> 388</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 389</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
+<tr> <td class="numLine"> 390</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> * Represents the ACL tag sent in feeds.</span></pre></td></tr>
+<tr> <td class="numLine"> 391</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
+<tr> <td class="numLine"> 392</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">class</span> AclItem <span class="keyword">implements</span> Item {</pre></td></tr>
+<tr> <td class="numLine"> 393</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> DocId id;</pre></td></tr>
+<tr> <td class="numLine"> 394</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> String docIdFragment;</pre></td></tr>
+<tr> <td class="numLine"> 395</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">private</span> Acl acl;</pre></td></tr>
+<tr> <td class="numLine"> 396</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 397</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> AclItem(DocId id, Acl acl) {</pre></td></tr>
+<tr> <td class="numLineCover"> 398</td> <td class="nbHitsCovered"> 12</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(id, <span class="keyword">null</span>, acl);</pre></td></tr>
+<tr> <td class="numLineCover"> 399</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 400</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLineCover"> 401</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> <span class="keyword">public</span> AclItem(DocId id, String docIdFragment, Acl acl) {</pre></td></tr>
+<tr> <td class="numLineCover"> 402</td> <td class="nbHitsCovered"><a title="Line 402: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 19</a></td> <td class="src"><pre class="src"> <a title="Line 402: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (id == <span class="keyword">null</span> || acl == <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 403</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException(<span class="string">"DocId and Acl must not be null"</span>);</pre></td></tr>
+<tr> <td class="numLine"> 404</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 405</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.id = id;</pre></td></tr>
+<tr> <td class="numLineCover"> 406</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.docIdFragment = docIdFragment;</pre></td></tr>
+<tr> <td class="numLineCover"> 407</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.acl = acl;</pre></td></tr>
+<tr> <td class="numLineCover"> 408</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 409</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 410</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> DocId getDocId() {</pre></td></tr>
+<tr> <td class="numLineCover"> 411</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">return</span> id;</pre></td></tr>
+<tr> <td class="numLine"> 412</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 413</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 414</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String getDocIdFragment() {</pre></td></tr>
+<tr> <td class="numLineCover"> 415</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> docIdFragment;</pre></td></tr>
+<tr> <td class="numLine"> 416</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 417</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 418</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> Acl getAcl() {</pre></td></tr>
+<tr> <td class="numLineCover"> 419</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span class="keyword">return</span> acl;</pre></td></tr>
+<tr> <td class="numLine"> 420</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 421</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 422</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
+<tr> <td class="numLine"> 423</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> equals(Object o) {</pre></td></tr>
+<tr> <td class="numLineCover"> 424</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> same = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 425</td> <td class="nbHitsUncovered"><a title="Line 425: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 425: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (<span class="keyword">null</span> != o && <span class="keyword">this</span>.getClass().equals(o.getClass())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 426</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> AclItem other = (AclItem) o;</pre></td></tr>
+<tr> <td class="numLineCover"> 427</td> <td class="nbHitsUncovered"><a title="Line 427: Conditional coverage 40% (4/10) [each condition: 50%, 50%, 50%, 50%, 0%]."> 2</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 427: Conditional coverage 40% (4/10) [each condition: 50%, 50%, 50%, 50%, 0%]."> same = id.equals(other.id) && acl.equals(other.acl)</a></span></pre></td></tr>
+<tr> <td class="numLine"> 428</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> && (docIdFragment == <span class="keyword">null</span> ? other.docIdFragment == <span class="keyword">null</span> :</pre></td></tr>
+<tr> <td class="numLine"> 429</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> docIdFragment.equals(other.docIdFragment));</pre></td></tr>
+<tr> <td class="numLine"> 430</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 431</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> same;</pre></td></tr>
+<tr> <td class="numLine"> 432</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 433</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 434</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 435</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> hashCode() {</pre></td></tr>
+<tr> <td class="numLineCover"> 436</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> Object members[] = <span class="keyword">new</span> Object[] { id, acl, docIdFragment };</pre></td></tr>
+<tr> <td class="numLineCover"> 437</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Arrays.hashCode(members);</pre></td></tr>
+<tr> <td class="numLine"> 438</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 439</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> </pre></td></tr>
+<tr> <td class="numLine"> 440</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> @Override </pre></td></tr>
+<tr> <td class="numLine"> 441</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> <span class="keyword">public</span> String toString() {</pre></td></tr>
+<tr> <td class="numLineCover"> 442</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="string">"AclItem("</span> + id + <span class="string">","</span> + docIdFragment + <span class="string">","</span> + acl + <span class="string">")"</span>;</pre></td></tr>
+<tr> <td class="numLine"> 443</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 444</td> <td class="nbHits"> </td>
+ <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLine"> 445</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
</table>
diff --git a/coverage/com.google.enterprise.adaptor.DownloadDumpHandler.html b/coverage/com.google.enterprise.adaptor.DownloadDumpHandler.html
index c3eae4b..982d673 100644
--- a/coverage/com.google.enterprise.adaptor.DownloadDumpHandler.html
+++ b/coverage/com.google.enterprise.adaptor.DownloadDumpHandler.html
@@ -330,20 +330,20 @@
<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">new</span> TreeMap<String, StackTraceElement[]>();</pre></td></tr>
<tr> <td class="numLineCover"> 190</td> <td class="nbHitsCovered"><a title="Line 190: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 190: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Map.Entry<Thread, StackTraceElement[]> me : allThreads.entrySet()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 191</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> sortedThreads.put(me.getKey().toString(), me.getValue());</pre></td></tr>
+<tr> <td class="numLineCover"> 191</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> sortedThreads.put(me.getKey().toString(), me.getValue());</pre></td></tr>
<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLineCover"> 193</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> zos.putNextEntry(<span class="keyword">new</span> ZipEntry(<span class="string">"threaddump.txt"</span>));</pre></td></tr>
<tr> <td class="numLineCover"> 194</td> <td class="nbHitsCovered"><a title="Line 194: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 194: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Map.Entry<String, StackTraceElement[]> me : sortedThreads.entrySet()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 195</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> writer.write(me.getKey());</pre></td></tr>
-<tr> <td class="numLineCover"> 196</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> writer.write(newline);</pre></td></tr>
-<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"><a title="Line 197: Conditional coverage 100% (2/2)."> 192</a></td> <td class="src"><pre class="src"> <a title="Line 197: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (StackTraceElement element : me.getValue()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 198</td> <td class="nbHitsCovered"> 168</td> <td class="src"><pre class="src"> writer.write(<span class="string">" "</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 199</td> <td class="nbHitsCovered"> 168</td> <td class="src"><pre class="src"> writer.write(<span class="string">""</span> + element);</pre></td></tr>
-<tr> <td class="numLineCover"> 200</td> <td class="nbHitsCovered"> 168</td> <td class="src"><pre class="src"> writer.write(newline);</pre></td></tr>
+<tr> <td class="numLineCover"> 195</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> writer.write(me.getKey());</pre></td></tr>
+<tr> <td class="numLineCover"> 196</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> writer.write(newline);</pre></td></tr>
+<tr> <td class="numLineCover"> 197</td> <td class="nbHitsCovered"><a title="Line 197: Conditional coverage 100% (2/2)."> 176</a></td> <td class="src"><pre class="src"> <a title="Line 197: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (StackTraceElement element : me.getValue()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 198</td> <td class="nbHitsCovered"> 156</td> <td class="src"><pre class="src"> writer.write(<span class="string">" "</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 199</td> <td class="nbHitsCovered"> 156</td> <td class="src"><pre class="src"> writer.write(<span class="string">""</span> + element);</pre></td></tr>
+<tr> <td class="numLineCover"> 200</td> <td class="nbHitsCovered"> 156</td> <td class="src"><pre class="src"> writer.write(newline);</pre></td></tr>
<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"> 24</td> <td class="src"><pre class="src"> writer.write(newline);</pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"> 20</td> <td class="src"><pre class="src"> writer.write(newline);</pre></td></tr>
<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLineCover"> 204</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> writer.flush();</pre></td></tr>
diff --git a/coverage/com.google.enterprise.adaptor.ExceptionHandlers.html b/coverage/com.google.enterprise.adaptor.ExceptionHandlers.html
index 497f164..3060ff1 100644
--- a/coverage/com.google.enterprise.adaptor.ExceptionHandlers.html
+++ b/coverage/com.google.enterprise.adaptor.ExceptionHandlers.html
@@ -87,7 +87,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 36</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> ExceptionHandler defaultHandler() {</pre></td></tr>
-<tr> <td class="numLineCover"> 37</td> <td class="nbHitsCovered"> 73</td> <td class="src"><pre class="src"> <span class="keyword">return</span> defaultHandler;</pre></td></tr>
+<tr> <td class="numLineCover"> 37</td> <td class="nbHitsCovered"> 75</td> <td class="src"><pre class="src"> <span class="keyword">return</span> defaultHandler;</pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 39</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.FakeMap.html b/coverage/com.google.enterprise.adaptor.FakeMap.html
index 147774b..4d7af1f 100644
--- a/coverage/com.google.enterprise.adaptor.FakeMap.html
+++ b/coverage/com.google.enterprise.adaptor.FakeMap.html
@@ -65,7 +65,7 @@
<td class="src"><pre class="src"> <span class="comment"> * Fake modifiable map that doesn't store anything.</span></pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 25</td> <td class="nbHitsCovered"> 135</td> <td class="src"><pre class="src"> <span class="keyword">class</span> FakeMap<K, V> <span class="keyword">extends</span> AbstractMap<K, V> {</pre></td></tr>
+<tr> <td class="numLineCover"> 25</td> <td class="nbHitsCovered"> 138</td> <td class="src"><pre class="src"> <span class="keyword">class</span> FakeMap<K, V> <span class="keyword">extends</span> AbstractMap<K, V> {</pre></td></tr>
<tr> <td class="numLine"> 26</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.GroupPrincipal.html b/coverage/com.google.enterprise.adaptor.GroupPrincipal.html
index 02ec136..94df514 100644
--- a/coverage/com.google.enterprise.adaptor.GroupPrincipal.html
+++ b/coverage/com.google.enterprise.adaptor.GroupPrincipal.html
@@ -73,8 +73,8 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 29</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> GroupPrincipal(String name) {</pre></td></tr>
-<tr> <td class="numLineCover"> 30</td> <td class="nbHitsCovered"> 167</td> <td class="src"><pre class="src"> <span class="keyword">super</span>(name);</pre></td></tr>
-<tr> <td class="numLineCover"> 31</td> <td class="nbHitsCovered"> 161</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 30</td> <td class="nbHitsCovered"> 173</td> <td class="src"><pre class="src"> <span class="keyword">super</span>(name);</pre></td></tr>
+<tr> <td class="numLineCover"> 31</td> <td class="nbHitsCovered"> 167</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 32</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 33</td> <td class="nbHits"> </td>
@@ -83,7 +83,7 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 35</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isUser() {</pre></td></tr>
-<tr> <td class="numLineCover"> 36</td> <td class="nbHitsCovered"> 896</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 36</td> <td class="nbHitsCovered"> 913</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.GsaCommunicationHandler.html b/coverage/com.google.enterprise.adaptor.GsaCommunicationHandler.html
index 9c6dc69..e3d239c 100644
--- a/coverage/com.google.enterprise.adaptor.GsaCommunicationHandler.html
+++ b/coverage/com.google.enterprise.adaptor.GsaCommunicationHandler.html
@@ -277,10 +277,10 @@
<td class="src"><pre class="src"> <span class="comment"> * new start() calls before stop() is done processing.</span></pre></td></tr>
<tr> <td class="numLine"> 128</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 129</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> AtomicInteger shutdownCount = <span class="keyword">new</span> AtomicInteger();</pre></td></tr>
+<tr> <td class="numLineCover"> 129</td> <td class="nbHitsCovered"> 44</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> AtomicInteger shutdownCount = <span class="keyword">new</span> AtomicInteger();</pre></td></tr>
<tr> <td class="numLine"> 130</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> ShutdownWaiter waiter;</pre></td></tr>
-<tr> <td class="numLineCover"> 131</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> List<Filter> commonFilters = Arrays.asList(<span class="keyword">new</span> Filter[] {</pre></td></tr>
+<tr> <td class="numLineCover"> 131</td> <td class="nbHitsCovered"> 44</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> List<Filter> commonFilters = Arrays.asList(<span class="keyword">new</span> Filter[] {</pre></td></tr>
<tr> <td class="numLine"> 132</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">new</span> AbortImmediatelyFilter(),</pre></td></tr>
<tr> <td class="numLine"> 133</td> <td class="nbHits"> </td>
@@ -291,13 +291,13 @@
<td class="src"><pre class="src"> });</pre></td></tr>
<tr> <td class="numLine"> 136</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 137</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> <span class="keyword">public</span> GsaCommunicationHandler(Adaptor adaptor, Config config) {</pre></td></tr>
-<tr> <td class="numLineCover"> 138</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.adaptor = adaptor;</pre></td></tr>
-<tr> <td class="numLineCover"> 139</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.config = config;</pre></td></tr>
+<tr> <td class="numLineCover"> 137</td> <td class="nbHitsCovered"> 44</td> <td class="src"><pre class="src"> <span class="keyword">public</span> GsaCommunicationHandler(Adaptor adaptor, Config config) {</pre></td></tr>
+<tr> <td class="numLineCover"> 138</td> <td class="nbHitsCovered"> 44</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.adaptor = adaptor;</pre></td></tr>
+<tr> <td class="numLineCover"> 139</td> <td class="nbHitsCovered"> 44</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.config = config;</pre></td></tr>
<tr> <td class="numLine"> 140</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 141</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> journal = <span class="keyword">new</span> Journal(config.isJournalReducedMem());</pre></td></tr>
-<tr> <td class="numLineCover"> 142</td> <td class="nbHitsCovered"> 43</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 141</td> <td class="nbHitsCovered"> 44</td> <td class="src"><pre class="src"> journal = <span class="keyword">new</span> Journal(config.isJournalReducedMem());</pre></td></tr>
+<tr> <td class="numLineCover"> 142</td> <td class="nbHitsCovered"> 44</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 143</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 144</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.GsaFeedFileMaker.html b/coverage/com.google.enterprise.adaptor.GsaFeedFileMaker.html
index b2f2d62..7319827 100644
--- a/coverage/com.google.enterprise.adaptor.GsaFeedFileMaker.html
+++ b/coverage/com.google.enterprise.adaptor.GsaFeedFileMaker.html
@@ -151,22 +151,22 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> GsaFeedFileMaker(DocIdEncoder encoder, AclTransform aclTransform) {</pre></td></tr>
-<tr> <td class="numLineCover"> 70</td> <td class="nbHitsCovered"> 29</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(encoder, aclTransform, <span class="keyword">false</span>, <span class="keyword">false</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 71</td> <td class="nbHitsCovered"> 29</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 70</td> <td class="nbHitsCovered"> 31</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(encoder, aclTransform, <span class="keyword">false</span>, <span class="keyword">false</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 71</td> <td class="nbHitsCovered"> 31</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 72</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> GsaFeedFileMaker(DocIdEncoder encoder, AclTransform aclTransform,</pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">boolean</span> separateClosingRecordTagWorkaround,</pre></td></tr>
-<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> useAuthMethodWorkaround) {</pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.idEncoder = encoder;</pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.aclTransform = aclTransform;</pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.separateClosingRecordTagWorkaround</pre></td></tr>
+<tr> <td class="numLineCover"> 75</td> <td class="nbHitsCovered"> 51</td> <td class="src"><pre class="src"> <span class="keyword">boolean</span> useAuthMethodWorkaround) {</pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 51</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.idEncoder = encoder;</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 51</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.aclTransform = aclTransform;</pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 51</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.separateClosingRecordTagWorkaround</pre></td></tr>
<tr> <td class="numLine"> 79</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> = separateClosingRecordTagWorkaround;</pre></td></tr>
-<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.useAuthMethodWorkaround = useAuthMethodWorkaround;</pre></td></tr>
-<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 80</td> <td class="nbHitsCovered"> 51</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.useAuthMethodWorkaround = useAuthMethodWorkaround;</pre></td></tr>
+<tr> <td class="numLineCover"> 81</td> <td class="nbHitsCovered"> 51</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 82</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 83</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.GsaFeedFileSender.html b/coverage/com.google.enterprise.adaptor.GsaFeedFileSender.html
index c09387b..436d4f3 100644
--- a/coverage/com.google.enterprise.adaptor.GsaFeedFileSender.html
+++ b/coverage/com.google.enterprise.adaptor.GsaFeedFileSender.html
@@ -116,17 +116,17 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> URL makeHandlerUrl(String host, <span class="keyword">boolean</span> secure, String path) {</pre></td></tr>
-<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"><a title="Line 52: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 71</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 52: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (<span class="keyword">null</span> == host || <span class="keyword">null</span> == path) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 52</td> <td class="nbHitsUncovered"><a title="Line 52: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> 75</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 52: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">if</span> (<span class="keyword">null</span> == host || <span class="keyword">null</span> == path) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 53</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException();</span></pre></td></tr>
<tr> <td class="numLine"> 54</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"><a title="Line 56: Conditional coverage 100% (2/2)."> 71</a></td> <td class="src"><pre class="src"> <a title="Line 56: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (secure) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"><a title="Line 56: Conditional coverage 100% (2/2)."> 75</a></td> <td class="src"><pre class="src"> <a title="Line 56: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (secure) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 57</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> URL(<span class="string">"https://"</span> + host + <span class="string">":19902/"</span> + path);</pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsCovered"> 69</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> URL(<span class="string">"http://"</span> + host + <span class="string">":19900/"</span> + path);</pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsCovered"> 73</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> URL(<span class="string">"http://"</span> + host + <span class="string">":19900/"</span> + path);</pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (MalformedURLException mue) {</pre></td></tr>
@@ -139,23 +139,23 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> GsaFeedFileSender(String host, <span class="keyword">boolean</span> secure, Charset gsaCharSet) {</pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsCovered"> 36</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(makeHandlerUrl(host, secure, <span class="string">"xmlfeed"</span>),</pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsCovered"> 38</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(makeHandlerUrl(host, secure, <span class="string">"xmlfeed"</span>),</pre></td></tr>
<tr> <td class="numLine"> 68</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> makeHandlerUrl(host, secure, <span class="string">"xmlgroups"</span>), gsaCharSet);</pre></td></tr>
-<tr> <td class="numLineCover"> 69</td> <td class="nbHitsCovered"> 35</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 69</td> <td class="nbHitsCovered"> 37</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 70</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @VisibleForTesting</pre></td></tr>
-<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> GsaFeedFileSender(URL feedUrl, URL groupsUrl, Charset gsaCharSet) {</pre></td></tr>
-<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"><a title="Line 73: Conditional coverage 50% (1/2)."> 47</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 73: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="keyword">null</span> == gsaCharSet) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> GsaFeedFileSender(URL feedUrl, URL groupsUrl, Charset gsaCharSet) {</pre></td></tr>
+<tr> <td class="numLineCover"> 73</td> <td class="nbHitsUncovered"><a title="Line 73: Conditional coverage 50% (1/2)."> 49</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 73: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (<span class="keyword">null</span> == gsaCharSet) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 74</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException();</span></pre></td></tr>
<tr> <td class="numLine"> 75</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> feedDest = feedUrl;</pre></td></tr>
-<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> groupsDest = groupsUrl;</pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> gsaCharEncoding = gsaCharSet;</pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 47</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 76</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> feedDest = feedUrl;</pre></td></tr>
+<tr> <td class="numLineCover"> 77</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> groupsDest = groupsUrl;</pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> gsaCharEncoding = gsaCharSet;</pre></td></tr>
+<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.HttpExchanges.html b/coverage/com.google.enterprise.adaptor.HttpExchanges.html
index 3481ed2..ae42ef3 100644
--- a/coverage/com.google.enterprise.adaptor.HttpExchanges.html
+++ b/coverage/com.google.enterprise.adaptor.HttpExchanges.html
@@ -312,7 +312,7 @@
<td class="src"><pre class="src"> <span class="keyword">throws</span> IOException {</pre></td></tr>
<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// TODO(ejona): use exchange to decide on response language</span></pre></td></tr>
-<tr> <td class="numLineCover"> 171</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> cannedRespond(ex, code, <span class="string">"text/plain"</span>, response.toString());</pre></td></tr>
+<tr> <td class="numLineCover"> 171</td> <td class="nbHitsCovered"> 50</td> <td class="src"><pre class="src"> cannedRespond(ex, code, <span class="string">"text/plain"</span>, response.toString());</pre></td></tr>
<tr> <td class="numLineCover"> 172</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
@@ -344,11 +344,11 @@
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">void</span> cannedRespond(HttpExchange ex, <span class="keyword">int</span> code,</pre></td></tr>
<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> String contentType, String response) <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"><a title="Line 189: Conditional coverage 100% (2/2)."> 63</a></td> <td class="src"><pre class="src"> <a title="Line 189: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="string">"HEAD"</span>.equals(ex.getRequestMethod())) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"><a title="Line 189: Conditional coverage 100% (2/2)."> 64</a></td> <td class="src"><pre class="src"> <a title="Line 189: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (<span class="string">"HEAD"</span>.equals(ex.getRequestMethod())) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 190</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> respondToHead(ex, code, contentType);</pre></td></tr>
<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 192</td> <td class="nbHitsCovered"> 62</td> <td class="src"><pre class="src"> respond(ex, code, contentType, response.getBytes(ENCODING));</pre></td></tr>
+<tr> <td class="numLineCover"> 192</td> <td class="nbHitsCovered"> 63</td> <td class="src"><pre class="src"> respond(ex, code, contentType, response.getBytes(ENCODING));</pre></td></tr>
<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLineCover"> 194</td> <td class="nbHitsCovered"> 63</td> <td class="src"><pre class="src"> }</pre></td></tr>
@@ -366,12 +366,12 @@
<td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">void</span> startResponse(HttpExchange ex, <span class="keyword">int</span> code,</pre></td></tr>
<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> String contentType, <span class="keyword">boolean</span> hasBody) <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"> 149</td> <td class="src"><pre class="src"> log.finest(<span class="string">"Starting response"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 203</td> <td class="nbHitsCovered"><a title="Line 203: Conditional coverage 100% (2/2)."> 149</a></td> <td class="src"><pre class="src"> <a title="Line 203: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (contentType != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsCovered"> 98</td> <td class="src"><pre class="src"> ex.getResponseHeaders().set(<span class="string">"Content-Type"</span>, contentType);</pre></td></tr>
+<tr> <td class="numLineCover"> 202</td> <td class="nbHitsCovered"> 150</td> <td class="src"><pre class="src"> log.finest(<span class="string">"Starting response"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 203</td> <td class="nbHitsCovered"><a title="Line 203: Conditional coverage 100% (2/2)."> 150</a></td> <td class="src"><pre class="src"> <a title="Line 203: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (contentType != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsCovered"> 99</td> <td class="src"><pre class="src"> ex.getResponseHeaders().set(<span class="string">"Content-Type"</span>, contentType);</pre></td></tr>
<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"><a title="Line 206: Conditional coverage 100% (2/2)."> 149</a></td> <td class="src"><pre class="src"> <a title="Line 206: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!hasBody) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"><a title="Line 206: Conditional coverage 100% (2/2)."> 150</a></td> <td class="src"><pre class="src"> <a title="Line 206: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!hasBody) {</a></pre></td></tr>
<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// No body. Required for HEAD requests</span></pre></td></tr>
<tr> <td class="numLineCover"> 208</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> ex.sendResponseHeaders(code, -1);</pre></td></tr>
@@ -379,10 +379,10 @@
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Chuncked encoding</span></pre></td></tr>
-<tr> <td class="numLineCover"> 211</td> <td class="nbHitsCovered"> 139</td> <td class="src"><pre class="src"> ex.sendResponseHeaders(code, 0);</pre></td></tr>
+<tr> <td class="numLineCover"> 211</td> <td class="nbHitsCovered"> 140</td> <td class="src"><pre class="src"> ex.sendResponseHeaders(code, 0);</pre></td></tr>
<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 213</td> <td class="nbHitsCovered"> 149</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 213</td> <td class="nbHitsCovered"> 150</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
@@ -397,12 +397,12 @@
<td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">void</span> respond(HttpExchange ex, <span class="keyword">int</span> code, String contentType,</pre></td></tr>
<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">byte</span> response[]) <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 221</td> <td class="nbHitsCovered"><a title="Line 221: Conditional coverage 100% (2/2)."> 99</a></td> <td class="src"><pre class="src"> <a title="Line 221: Conditional coverage 100% (2/2)."> startResponse(ex, code, contentType, response != <span class="keyword">null</span>);</a></pre></td></tr>
-<tr> <td class="numLineCover"> 222</td> <td class="nbHitsCovered"><a title="Line 222: Conditional coverage 100% (2/2)."> 99</a></td> <td class="src"><pre class="src"> <a title="Line 222: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (response != <span class="keyword">null</span>) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 223</td> <td class="nbHitsCovered"> 91</td> <td class="src"><pre class="src"> OutputStream responseBody = ex.getResponseBody();</pre></td></tr>
-<tr> <td class="numLineCover"> 224</td> <td class="nbHitsCovered"> 91</td> <td class="src"><pre class="src"> log.finest(<span class="string">"before writing response"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 225</td> <td class="nbHitsCovered"> 91</td> <td class="src"><pre class="src"> responseBody.write(response);</pre></td></tr>
-<tr> <td class="numLineCover"> 226</td> <td class="nbHitsCovered"> 91</td> <td class="src"><pre class="src"> responseBody.flush();</pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsCovered"><a title="Line 221: Conditional coverage 100% (2/2)."> 100</a></td> <td class="src"><pre class="src"> <a title="Line 221: Conditional coverage 100% (2/2)."> startResponse(ex, code, contentType, response != <span class="keyword">null</span>);</a></pre></td></tr>
+<tr> <td class="numLineCover"> 222</td> <td class="nbHitsCovered"><a title="Line 222: Conditional coverage 100% (2/2)."> 100</a></td> <td class="src"><pre class="src"> <a title="Line 222: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (response != <span class="keyword">null</span>) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 223</td> <td class="nbHitsCovered"> 92</td> <td class="src"><pre class="src"> OutputStream responseBody = ex.getResponseBody();</pre></td></tr>
+<tr> <td class="numLineCover"> 224</td> <td class="nbHitsCovered"> 92</td> <td class="src"><pre class="src"> log.finest(<span class="string">"before writing response"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 225</td> <td class="nbHitsCovered"> 92</td> <td class="src"><pre class="src"> responseBody.write(response);</pre></td></tr>
+<tr> <td class="numLineCover"> 226</td> <td class="nbHitsCovered"> 92</td> <td class="src"><pre class="src"> responseBody.flush();</pre></td></tr>
<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// This shouldn't be needed, but without it one developer had trouble</span></pre></td></tr>
<tr> <td class="numLineCover"> 228</td> <td class="nbHitsCovered"> 91</td> <td class="src"><pre class="src"> responseBody.close();</pre></td></tr>
@@ -582,7 +582,7 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">boolean</span> headersSent(HttpExchange ex) {</pre></td></tr>
-<tr> <td class="numLineCover"> 335</td> <td class="nbHitsCovered"><a title="Line 335: Conditional coverage 100% (2/2)."> 14</a></td> <td class="src"><pre class="src"> <a title="Line 335: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> ex.getResponseHeaders().getFirst(<span class="string">"Date"</span>) != <span class="keyword">null</span>;</a></pre></td></tr>
+<tr> <td class="numLineCover"> 335</td> <td class="nbHitsCovered"><a title="Line 335: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 335: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> ex.getResponseHeaders().getFirst(<span class="string">"Date"</span>) != <span class="keyword">null</span>;</a></pre></td></tr>
<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.IOHelper.html b/coverage/com.google.enterprise.adaptor.IOHelper.html
index 523fa43..62606ef 100644
--- a/coverage/com.google.enterprise.adaptor.IOHelper.html
+++ b/coverage/com.google.enterprise.adaptor.IOHelper.html
@@ -95,12 +95,12 @@
<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"> 120</td> <td class="src"><pre class="src"> <span class="keyword">byte</span>[] buffer = <span class="keyword">new</span> <span class="keyword">byte</span>[1024];</pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">int</span> read;</pre></td></tr>
-<tr> <td class="numLineCover"> 41</td> <td class="nbHitsCovered"><a title="Line 41: Conditional coverage 100% (2/2)."> 258</a></td> <td class="src"><pre class="src"> <a title="Line 41: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> ((read = in.read(buffer)) != -1) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 139</td> <td class="src"><pre class="src"> out.write(buffer, 0, read);</pre></td></tr>
+<tr> <td class="numLineCover"> 41</td> <td class="nbHitsCovered"><a title="Line 41: Conditional coverage 100% (2/2)."> 643</a></td> <td class="src"><pre class="src"> <a title="Line 41: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> ((read = in.read(buffer)) != -1) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 524</td> <td class="src"><pre class="src"> out.write(buffer, 0, read);</pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 44</td> <td class="nbHitsCovered"> 116</td> <td class="src"><pre class="src"> out.flush();</pre></td></tr>
-<tr> <td class="numLineCover"> 45</td> <td class="nbHitsCovered"> 116</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 44</td> <td class="nbHitsCovered"> 117</td> <td class="src"><pre class="src"> out.flush();</pre></td></tr>
+<tr> <td class="numLineCover"> 45</td> <td class="nbHitsCovered"> 117</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.InternalErrorFilter.html b/coverage/com.google.enterprise.adaptor.InternalErrorFilter.html
index 79880c1..88da5fe 100644
--- a/coverage/com.google.enterprise.adaptor.InternalErrorFilter.html
+++ b/coverage/com.google.enterprise.adaptor.InternalErrorFilter.html
@@ -73,7 +73,7 @@
<td class="src"><pre class="src"> <span class="comment"> * connection, when possible.</span></pre></td></tr>
<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 29</td> <td class="nbHitsCovered"> 48</td> <td class="src"><pre class="src"> <span class="keyword">class</span> InternalErrorFilter <span class="keyword">extends</span> Filter {</pre></td></tr>
+<tr> <td class="numLineCover"> 29</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> <span class="keyword">class</span> InternalErrorFilter <span class="keyword">extends</span> Filter {</pre></td></tr>
<tr> <td class="numLineCover"> 30</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger log</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> = Logger.getLogger(InternalErrorFilter.<span class="keyword">class</span>.getName());</pre></td></tr>
@@ -94,15 +94,15 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> doFilter(HttpExchange ex, Filter.Chain chain) <span class="keyword">throws</span> IOException {</pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 41</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> chain.doFilter(ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (Exception e) {</pre></td></tr>
+<tr> <td class="numLineCover"> 41</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> chain.doFilter(ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (Exception e) {</pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// We want to send 500 Internal Error if the response headers have not</span></pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// been sent, but HttpExchange doesn't provide a way to learn if they have</span></pre></td></tr>
<tr> <td class="numLine"> 45</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// been sent.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 46</td> <td class="nbHitsCovered"><a title="Line 46: Conditional coverage 100% (2/2)."> 3</a></td> <td class="src"><pre class="src"> <a title="Line 46: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!HttpExchanges.headersSent(ex)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 46</td> <td class="nbHitsCovered"><a title="Line 46: Conditional coverage 100% (2/2)."> 4</a></td> <td class="src"><pre class="src"> <a title="Line 46: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!HttpExchanges.headersSent(ex)) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 47</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Unexpected exception during request"</span>, e);</pre></td></tr>
<tr> <td class="numLineCover"> 48</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> HttpExchanges.cannedRespond(ex, HttpURLConnection.HTTP_INTERNAL_ERROR,</pre></td></tr>
<tr> <td class="numLine"> 49</td> <td class="nbHits"> </td>
@@ -113,11 +113,11 @@
<td class="src"><pre class="src"> <span class="comment">// The headers have already been sent, so all we can do is throw the</span></pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// exception up and allow the server to kill the connection.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 53</td> <td class="nbHitsCovered"><a title="Line 53: Conditional coverage 100% (2/2)."> 2</a></td> <td class="src"><pre class="src"> <a title="Line 53: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (e <span class="keyword">instanceof</span> RuntimeException) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 53</td> <td class="nbHitsCovered"><a title="Line 53: Conditional coverage 100% (2/2)."> 3</a></td> <td class="src"><pre class="src"> <a title="Line 53: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (e <span class="keyword">instanceof</span> RuntimeException) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 54</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> (RuntimeException) e;</pre></td></tr>
<tr> <td class="numLine"> 55</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> (IOException) e;</pre></td></tr>
+<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> (IOException) e;</pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.InvalidConfigurationException.html b/coverage/com.google.enterprise.adaptor.InvalidConfigurationException.html
index 8dc6a10..d2b3906 100644
--- a/coverage/com.google.enterprise.adaptor.InvalidConfigurationException.html
+++ b/coverage/com.google.enterprise.adaptor.InvalidConfigurationException.html
@@ -91,8 +91,8 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> InvalidConfigurationException(String message) {</pre></td></tr>
-<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">super</span>(message);</pre></td></tr>
-<tr> <td class="numLineCover"> 40</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">super</span>(message);</pre></td></tr>
+<tr> <td class="numLineCover"> 40</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.Journal.html b/coverage/com.google.enterprise.adaptor.Journal.html
index 7f72cf6..e52d8c4 100644
--- a/coverage/com.google.enterprise.adaptor.Journal.html
+++ b/coverage/com.google.enterprise.adaptor.Journal.html
@@ -118,7 +118,7 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 48</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/** Request processing start time storage until processing completion. */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 49</td> <td class="nbHitsCovered"> 217</td> <td class="src"><pre class="src"> <span class="keyword">private</span> ThreadLocal<Long> requestProcessingStart = <span class="keyword">new</span> ThreadLocal<Long>();</pre></td></tr>
+<tr> <td class="numLineCover"> 49</td> <td class="nbHitsCovered"> 220</td> <td class="src"><pre class="src"> <span class="keyword">private</span> ThreadLocal<Long> requestProcessingStart = <span class="keyword">new</span> ThreadLocal<Long>();</pre></td></tr>
<tr> <td class="numLine"> 50</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 51</td> <td class="nbHits"> </td>
@@ -139,7 +139,7 @@
<td class="src"><pre class="src"> <span class="comment">/** Date in milliseconds. */</span></pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">long</span> lastSuccessfulFullPushEnd;</pre></td></tr>
-<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"> 217</td> <td class="src"><pre class="src"> <span class="keyword">private</span> CompletionStatus lastFullPushStatus = CompletionStatus.SUCCESS;</pre></td></tr>
+<tr> <td class="numLineCover"> 60</td> <td class="nbHitsCovered"> 220</td> <td class="src"><pre class="src"> <span class="keyword">private</span> CompletionStatus lastFullPushStatus = CompletionStatus.SUCCESS;</pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 62</td> <td class="nbHits"> </td>
@@ -148,7 +148,7 @@
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">long</span> lastSuccessfulIncrementalPushStart;</pre></td></tr>
<tr> <td class="numLine"> 64</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">long</span> lastSuccessfulIncrementalPushEnd;</pre></td></tr>
-<tr> <td class="numLineCover"> 65</td> <td class="nbHitsCovered"> 217</td> <td class="src"><pre class="src"> <span class="keyword">private</span> CompletionStatus lastIncrementalPushStatus = CompletionStatus.SUCCESS;</pre></td></tr>
+<tr> <td class="numLineCover"> 65</td> <td class="nbHitsCovered"> 220</td> <td class="src"><pre class="src"> <span class="keyword">private</span> CompletionStatus lastIncrementalPushStatus = CompletionStatus.SUCCESS;</pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLineCover"> 67</td> <td class="nbHitsCovered"> 5</td> <td class="src"><pre class="src"> enum CompletionStatus {</pre></td></tr>
@@ -169,8 +169,8 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 77</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> Journal(<span class="keyword">boolean</span> reducedMem) {</pre></td></tr>
-<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 44</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(reducedMem, <span class="keyword">new</span> SystemTimeProvider());</pre></td></tr>
-<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 44</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 78</td> <td class="nbHitsCovered"> 45</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(reducedMem, <span class="keyword">new</span> SystemTimeProvider());</pre></td></tr>
+<tr> <td class="numLineCover"> 79</td> <td class="nbHitsCovered"> 45</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 80</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 81</td> <td class="nbHits"> </td>
@@ -181,20 +181,20 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 84</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">protected</span> Journal(TimeProvider timeProvider) {</pre></td></tr>
-<tr> <td class="numLineCover"> 85</td> <td class="nbHitsCovered"> 171</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(<span class="keyword">false</span>, timeProvider);</pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsCovered"> 171</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 85</td> <td class="nbHitsCovered"> 173</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(<span class="keyword">false</span>, timeProvider);</pre></td></tr>
+<tr> <td class="numLineCover"> 86</td> <td class="nbHitsCovered"> 173</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 87</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"> 217</td> <td class="src"><pre class="src"> <span class="keyword">protected</span> Journal(<span class="keyword">boolean</span> reducedMem, TimeProvider timeProvider) {</pre></td></tr>
-<tr> <td class="numLineCover"> 89</td> <td class="nbHitsCovered"> 217</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.timeProvider = timeProvider;</pre></td></tr>
-<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 217</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.startedAt = timeProvider.currentTimeMillis();</pre></td></tr>
-<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 217</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.timeResolution = determineTimeResolution();</pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"> 220</td> <td class="src"><pre class="src"> <span class="keyword">protected</span> Journal(<span class="keyword">boolean</span> reducedMem, TimeProvider timeProvider) {</pre></td></tr>
+<tr> <td class="numLineCover"> 89</td> <td class="nbHitsCovered"> 220</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.timeProvider = timeProvider;</pre></td></tr>
+<tr> <td class="numLineCover"> 90</td> <td class="nbHitsCovered"> 220</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.startedAt = timeProvider.currentTimeMillis();</pre></td></tr>
+<tr> <td class="numLineCover"> 91</td> <td class="nbHitsCovered"> 220</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.timeResolution = determineTimeResolution();</pre></td></tr>
<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// We want data within the Stats to agree with each other, so we provide the</span></pre></td></tr>
<tr> <td class="numLine"> 93</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// same time to each of them.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"> 217</td> <td class="src"><pre class="src"> <span class="keyword">long</span> time = startedAt;</pre></td></tr>
-<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 217</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.timeStats = <span class="keyword">new</span> Stats[] {</pre></td></tr>
+<tr> <td class="numLineCover"> 94</td> <td class="nbHitsCovered"> 220</td> <td class="src"><pre class="src"> <span class="keyword">long</span> time = startedAt;</pre></td></tr>
+<tr> <td class="numLineCover"> 95</td> <td class="nbHitsCovered"> 220</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.timeStats = <span class="keyword">new</span> Stats[] {</pre></td></tr>
<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">new</span> Stats(60, 1000, time), <span class="comment">/* one minute, second granularity */</span></pre></td></tr>
<tr> <td class="numLine"> 97</td> <td class="nbHits"> </td>
@@ -203,19 +203,19 @@
<td class="src"><pre class="src"> <span class="keyword">new</span> Stats(48, 1000 * 60 * 30, time), <span class="comment">/* one day, half-hour granularity */</span></pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> };</pre></td></tr>
-<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"> 217</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.dayStatsByHalfHour = <span class="keyword">this</span>.timeStats[<span class="keyword">this</span>.timeStats.length - 1];</pre></td></tr>
-<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"><a title="Line 101: Conditional coverage 100% (2/2)."> 217</a></td> <td class="src"><pre class="src"> <a title="Line 101: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (reducedMem) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"> 45</td> <td class="src"><pre class="src"> timesPushed = <span class="keyword">new</span> NegSizeFakeMap<DocId, Integer>();</pre></td></tr>
-<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 45</td> <td class="src"><pre class="src"> timesGsaRequested = <span class="keyword">new</span> NegSizeFakeMap<DocId, Integer>();</pre></td></tr>
-<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 45</td> <td class="src"><pre class="src"> timesNonGsaRequested = <span class="keyword">new</span> NegSizeFakeMap<DocId, Integer>();</pre></td></tr>
+<tr> <td class="numLineCover"> 100</td> <td class="nbHitsCovered"> 220</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.dayStatsByHalfHour = <span class="keyword">this</span>.timeStats[<span class="keyword">this</span>.timeStats.length - 1];</pre></td></tr>
+<tr> <td class="numLineCover"> 101</td> <td class="nbHitsCovered"><a title="Line 101: Conditional coverage 100% (2/2)."> 220</a></td> <td class="src"><pre class="src"> <a title="Line 101: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (reducedMem) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"> 46</td> <td class="src"><pre class="src"> timesPushed = <span class="keyword">new</span> NegSizeFakeMap<DocId, Integer>();</pre></td></tr>
+<tr> <td class="numLineCover"> 103</td> <td class="nbHitsCovered"> 46</td> <td class="src"><pre class="src"> timesGsaRequested = <span class="keyword">new</span> NegSizeFakeMap<DocId, Integer>();</pre></td></tr>
+<tr> <td class="numLineCover"> 104</td> <td class="nbHitsCovered"> 46</td> <td class="src"><pre class="src"> timesNonGsaRequested = <span class="keyword">new</span> NegSizeFakeMap<DocId, Integer>();</pre></td></tr>
<tr> <td class="numLine"> 105</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 172</td> <td class="src"><pre class="src"> timesPushed = <span class="keyword">new</span> HashMap<DocId, Integer>();</pre></td></tr>
-<tr> <td class="numLineCover"> 107</td> <td class="nbHitsCovered"> 172</td> <td class="src"><pre class="src"> timesGsaRequested = <span class="keyword">new</span> HashMap<DocId, Integer>();</pre></td></tr>
-<tr> <td class="numLineCover"> 108</td> <td class="nbHitsCovered"> 172</td> <td class="src"><pre class="src"> timesNonGsaRequested = <span class="keyword">new</span> HashMap<DocId, Integer>();</pre></td></tr>
+<tr> <td class="numLineCover"> 106</td> <td class="nbHitsCovered"> 174</td> <td class="src"><pre class="src"> timesPushed = <span class="keyword">new</span> HashMap<DocId, Integer>();</pre></td></tr>
+<tr> <td class="numLineCover"> 107</td> <td class="nbHitsCovered"> 174</td> <td class="src"><pre class="src"> timesGsaRequested = <span class="keyword">new</span> HashMap<DocId, Integer>();</pre></td></tr>
+<tr> <td class="numLineCover"> 108</td> <td class="nbHitsCovered"> 174</td> <td class="src"><pre class="src"> timesNonGsaRequested = <span class="keyword">new</span> HashMap<DocId, Integer>();</pre></td></tr>
<tr> <td class="numLine"> 109</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 217</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 110</td> <td class="nbHitsCovered"> 220</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 111</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 112</td> <td class="nbHits"> </td>
@@ -355,12 +355,12 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">long</span> determineTimeResolution() {</pre></td></tr>
-<tr> <td class="numLineCover"> 204</td> <td class="nbHitsCovered"> 217</td> <td class="src"><pre class="src"> <span class="keyword">long</span> resolution = Long.MAX_VALUE;</pre></td></tr>
-<tr> <td class="numLineCover"> 205</td> <td class="nbHitsCovered"><a title="Line 205: Conditional coverage 100% (2/2)."> 1302</a></td> <td class="src"><pre class="src"> <a title="Line 205: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < 5; i++) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"> 1085</td> <td class="src"><pre class="src"> resolution = Math.min(resolution, determineTimeResolutionOnce());</pre></td></tr>
+<tr> <td class="numLineCover"> 204</td> <td class="nbHitsCovered"> 220</td> <td class="src"><pre class="src"> <span class="keyword">long</span> resolution = Long.MAX_VALUE;</pre></td></tr>
+<tr> <td class="numLineCover"> 205</td> <td class="nbHitsCovered"><a title="Line 205: Conditional coverage 100% (2/2)."> 1320</a></td> <td class="src"><pre class="src"> <a title="Line 205: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < 5; i++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 206</td> <td class="nbHitsCovered"> 1100</td> <td class="src"><pre class="src"> resolution = Math.min(resolution, determineTimeResolutionOnce());</pre></td></tr>
<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 208</td> <td class="nbHitsCovered"> 217</td> <td class="src"><pre class="src"> <span class="keyword">return</span> resolution;</pre></td></tr>
+<tr> <td class="numLineCover"> 208</td> <td class="nbHitsCovered"> 220</td> <td class="src"><pre class="src"> <span class="keyword">return</span> resolution;</pre></td></tr>
<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td>
@@ -375,13 +375,13 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">long</span> determineTimeResolutionOnce() {</pre></td></tr>
-<tr> <td class="numLineCover"> 216</td> <td class="nbHitsCovered"> 1085</td> <td class="src"><pre class="src"> <span class="keyword">long</span> time = timeProvider.currentTimeMillis();</pre></td></tr>
-<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 1085</td> <td class="src"><pre class="src"> <span class="keyword">long</span> startTime = time;</pre></td></tr>
-<tr> <td class="numLineCover"> 218</td> <td class="nbHitsCovered"><a title="Line 218: Conditional coverage 100% (2/2)."> 176386</a></td> <td class="src"><pre class="src"> <a title="Line 218: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (startTime == time) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 219</td> <td class="nbHitsCovered"> 175301</td> <td class="src"><pre class="src"> time = timeProvider.currentTimeMillis();</pre></td></tr>
+<tr> <td class="numLineCover"> 216</td> <td class="nbHitsCovered"> 1100</td> <td class="src"><pre class="src"> <span class="keyword">long</span> time = timeProvider.currentTimeMillis();</pre></td></tr>
+<tr> <td class="numLineCover"> 217</td> <td class="nbHitsCovered"> 1100</td> <td class="src"><pre class="src"> <span class="keyword">long</span> startTime = time;</pre></td></tr>
+<tr> <td class="numLineCover"> 218</td> <td class="nbHitsCovered"><a title="Line 218: Conditional coverage 100% (2/2)."> 170001</a></td> <td class="src"><pre class="src"> <a title="Line 218: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (startTime == time) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 219</td> <td class="nbHitsCovered"> 168901</td> <td class="src"><pre class="src"> time = timeProvider.currentTimeMillis();</pre></td></tr>
<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 221</td> <td class="nbHitsCovered"> 1085</td> <td class="src"><pre class="src"> <span class="keyword">return</span> time - startTime;</pre></td></tr>
+<tr> <td class="numLineCover"> 221</td> <td class="nbHitsCovered"> 1100</td> <td class="src"><pre class="src"> <span class="keyword">return</span> time - startTime;</pre></td></tr>
<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td>
@@ -742,26 +742,26 @@
<td class="src"><pre class="src"> <span class="keyword">long</span> pendingStatPeriodEnd;</pre></td></tr>
<tr> <td class="numLine"> 452</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 453</td> <td class="nbHitsCovered"> 652</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Stats(<span class="keyword">int</span> statCount, <span class="keyword">long</span> snapshotDuration, <span class="keyword">long</span> currentTime) {</pre></td></tr>
-<tr> <td class="numLineCover"> 454</td> <td class="nbHitsCovered"> 652</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.snapshotDurationMs = snapshotDuration;</pre></td></tr>
+<tr> <td class="numLineCover"> 453</td> <td class="nbHitsCovered"> 661</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Stats(<span class="keyword">int</span> statCount, <span class="keyword">long</span> snapshotDuration, <span class="keyword">long</span> currentTime) {</pre></td></tr>
+<tr> <td class="numLineCover"> 454</td> <td class="nbHitsCovered"> 661</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.snapshotDurationMs = snapshotDuration;</pre></td></tr>
<tr> <td class="numLine"> 455</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 456</td> <td class="nbHitsCovered"> 652</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.stats = <span class="keyword">new</span> Stat[statCount];</pre></td></tr>
+<tr> <td class="numLineCover"> 456</td> <td class="nbHitsCovered"> 661</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.stats = <span class="keyword">new</span> Stat[statCount];</pre></td></tr>
<tr> <td class="numLine"> 457</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Pre-allocate all Stat objects</span></pre></td></tr>
-<tr> <td class="numLineCover"> 458</td> <td class="nbHitsCovered"><a title="Line 458: Conditional coverage 100% (2/2)."> 37110</a></td> <td class="src"><pre class="src"> <a title="Line 458: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < <span class="keyword">this</span>.stats.length; i++) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 459</td> <td class="nbHitsCovered"> 36458</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.stats[i] = <span class="keyword">new</span> Stat();</pre></td></tr>
+<tr> <td class="numLineCover"> 458</td> <td class="nbHitsCovered"><a title="Line 458: Conditional coverage 100% (2/2)."> 37623</a></td> <td class="src"><pre class="src"> <a title="Line 458: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < <span class="keyword">this</span>.stats.length; i++) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 459</td> <td class="nbHitsCovered"> 36962</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.stats[i] = <span class="keyword">new</span> Stat();</pre></td></tr>
<tr> <td class="numLine"> 460</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 461</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 462</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Initialize expiration times for pendingStat objects</span></pre></td></tr>
-<tr> <td class="numLineCover"> 463</td> <td class="nbHitsCovered"> 652</td> <td class="src"><pre class="src"> <span class="keyword">long</span> duration = <span class="keyword">this</span>.snapshotDurationMs;</pre></td></tr>
-<tr> <td class="numLineCover"> 464</td> <td class="nbHitsCovered"> 652</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.pendingStatPeriodEnd = ((currentTime / duration) * duration)</pre></td></tr>
+<tr> <td class="numLineCover"> 463</td> <td class="nbHitsCovered"> 661</td> <td class="src"><pre class="src"> <span class="keyword">long</span> duration = <span class="keyword">this</span>.snapshotDurationMs;</pre></td></tr>
+<tr> <td class="numLineCover"> 464</td> <td class="nbHitsCovered"> 661</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.pendingStatPeriodEnd = ((currentTime / duration) * duration)</pre></td></tr>
<tr> <td class="numLine"> 465</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> + duration;</pre></td></tr>
-<tr> <td class="numLineCover"> 466</td> <td class="nbHitsCovered"> 652</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 466</td> <td class="nbHitsCovered"> 661</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 467</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 468</td> <td class="nbHits"> </td>
@@ -781,14 +781,14 @@
<tr> <td class="numLine"> 475</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Check if the current Stat object is still valid to write to</span></pre></td></tr>
<tr> <td class="numLineCover"> 476</td> <td class="nbHitsCovered"><a title="Line 476: Conditional coverage 100% (2/2)."> 498</a></td> <td class="src"><pre class="src"> <a title="Line 476: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (pendingStatPeriodEnd > currentTime) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 477</td> <td class="nbHitsCovered"> 483</td> <td class="src"><pre class="src"> <span class="keyword">return</span> stats[currentStat];</pre></td></tr>
+<tr> <td class="numLineCover"> 477</td> <td class="nbHitsCovered"> 482</td> <td class="src"><pre class="src"> <span class="keyword">return</span> stats[currentStat];</pre></td></tr>
<tr> <td class="numLine"> 478</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 479</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Check if all the Stat objects are invalid. This occurs when the last</span></pre></td></tr>
<tr> <td class="numLine"> 480</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// request was a long time ago.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 481</td> <td class="nbHitsCovered"><a title="Line 481: Conditional coverage 100% (2/2)."> 15</a></td> <td class="src"><pre class="src"> <a title="Line 481: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (currentTime - pendingStatPeriodEnd</a></pre></td></tr>
+<tr> <td class="numLineCover"> 481</td> <td class="nbHitsCovered"><a title="Line 481: Conditional coverage 100% (2/2)."> 16</a></td> <td class="src"><pre class="src"> <a title="Line 481: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (currentTime - pendingStatPeriodEnd</a></pre></td></tr>
<tr> <td class="numLine"> 482</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> > snapshotDurationMs * stats.length) {</pre></td></tr>
<tr> <td class="numLineCover"> 483</td> <td class="nbHitsCovered"><a title="Line 483: Conditional coverage 100% (2/2)."> 403</a></td> <td class="src"><pre class="src"> <a title="Line 483: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (<span class="keyword">int</span> i = 0; i < stats.length; i++) {</a></pre></td></tr>
@@ -801,14 +801,14 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 489</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Walk through time to get the current Stat object</span></pre></td></tr>
-<tr> <td class="numLineCover"> 490</td> <td class="nbHitsCovered"><a title="Line 490: Conditional coverage 100% (2/2)."> 203</a></td> <td class="src"><pre class="src"> <a title="Line 490: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (pendingStatPeriodEnd <= currentTime) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 491</td> <td class="nbHitsCovered"> 188</td> <td class="src"><pre class="src"> currentStat++;</pre></td></tr>
-<tr> <td class="numLineCover"> 492</td> <td class="nbHitsCovered"> 188</td> <td class="src"><pre class="src"> currentStat %= stats.length;</pre></td></tr>
-<tr> <td class="numLineCover"> 493</td> <td class="nbHitsCovered"> 188</td> <td class="src"><pre class="src"> stats[currentStat].reset();</pre></td></tr>
-<tr> <td class="numLineCover"> 494</td> <td class="nbHitsCovered"> 188</td> <td class="src"><pre class="src"> pendingStatPeriodEnd += snapshotDurationMs;</pre></td></tr>
+<tr> <td class="numLineCover"> 490</td> <td class="nbHitsCovered"><a title="Line 490: Conditional coverage 100% (2/2)."> 205</a></td> <td class="src"><pre class="src"> <a title="Line 490: Conditional coverage 100% (2/2)."> <span class="keyword">while</span> (pendingStatPeriodEnd <= currentTime) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 491</td> <td class="nbHitsCovered"> 189</td> <td class="src"><pre class="src"> currentStat++;</pre></td></tr>
+<tr> <td class="numLineCover"> 492</td> <td class="nbHitsCovered"> 189</td> <td class="src"><pre class="src"> currentStat %= stats.length;</pre></td></tr>
+<tr> <td class="numLineCover"> 493</td> <td class="nbHitsCovered"> 189</td> <td class="src"><pre class="src"> stats[currentStat].reset();</pre></td></tr>
+<tr> <td class="numLineCover"> 494</td> <td class="nbHitsCovered"> 189</td> <td class="src"><pre class="src"> pendingStatPeriodEnd += snapshotDurationMs;</pre></td></tr>
<tr> <td class="numLine"> 495</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 496</td> <td class="nbHitsCovered"> 15</td> <td class="src"><pre class="src"> <span class="keyword">return</span> stats[currentStat];</pre></td></tr>
+<tr> <td class="numLineCover"> 496</td> <td class="nbHitsCovered"> 16</td> <td class="src"><pre class="src"> <span class="keyword">return</span> stats[currentStat];</pre></td></tr>
<tr> <td class="numLine"> 497</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 498</td> <td class="nbHits"> </td>
@@ -843,7 +843,7 @@
<td class="src"><pre class="src"> <span class="comment"> * as controlled by {@link Stats}.</span></pre></td></tr>
<tr> <td class="numLine"> 517</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 518</td> <td class="nbHitsCovered"> 584</td> <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">class</span> Stat <span class="keyword">implements</span> Cloneable {</pre></td></tr>
+<tr> <td class="numLineCover"> 518</td> <td class="nbHitsCovered"> 585</td> <td class="src"><pre class="src"> <span class="keyword">static</span> <span class="keyword">class</span> Stat <span class="keyword">implements</span> Cloneable {</pre></td></tr>
<tr> <td class="numLine"> 519</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr>
<tr> <td class="numLine"> 520</td> <td class="nbHits"> </td>
@@ -894,9 +894,9 @@
<td class="src"><pre class="src"> <span class="keyword">boolean</span> gsaRetrievedDocument;</pre></td></tr>
<tr> <td class="numLine"> 543</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 544</td> <td class="nbHitsCovered"> 36458</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Stat() {</pre></td></tr>
-<tr> <td class="numLineCover"> 545</td> <td class="nbHitsCovered"> 36458</td> <td class="src"><pre class="src"> reset();</pre></td></tr>
-<tr> <td class="numLineCover"> 546</td> <td class="nbHitsCovered"> 36458</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 544</td> <td class="nbHitsCovered"> 36962</td> <td class="src"><pre class="src"> <span class="keyword">public</span> Stat() {</pre></td></tr>
+<tr> <td class="numLineCover"> 545</td> <td class="nbHitsCovered"> 36962</td> <td class="src"><pre class="src"> reset();</pre></td></tr>
+<tr> <td class="numLineCover"> 546</td> <td class="nbHitsCovered"> 36962</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 547</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 548</td> <td class="nbHits"> </td>
@@ -907,13 +907,13 @@
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine"> 551</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> reset() {</pre></td></tr>
-<tr> <td class="numLineCover"> 552</td> <td class="nbHitsCovered"> 37042</td> <td class="src"><pre class="src"> requestProcessingsCount = 0;</pre></td></tr>
-<tr> <td class="numLineCover"> 553</td> <td class="nbHitsCovered"> 37042</td> <td class="src"><pre class="src"> requestProcessingsFailureCount = 0;</pre></td></tr>
-<tr> <td class="numLineCover"> 554</td> <td class="nbHitsCovered"> 37042</td> <td class="src"><pre class="src"> requestProcessingsDurationSum = 0;</pre></td></tr>
-<tr> <td class="numLineCover"> 555</td> <td class="nbHitsCovered"> 37042</td> <td class="src"><pre class="src"> requestProcessingsMaxDuration = 0;</pre></td></tr>
-<tr> <td class="numLineCover"> 556</td> <td class="nbHitsCovered"> 37042</td> <td class="src"><pre class="src"> requestProcessingsThroughput = 0;</pre></td></tr>
-<tr> <td class="numLineCover"> 557</td> <td class="nbHitsCovered"> 37042</td> <td class="src"><pre class="src"> gsaRetrievedDocument = <span class="keyword">false</span>;</pre></td></tr>
-<tr> <td class="numLineCover"> 558</td> <td class="nbHitsCovered"> 37042</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 552</td> <td class="nbHitsCovered"> 37547</td> <td class="src"><pre class="src"> requestProcessingsCount = 0;</pre></td></tr>
+<tr> <td class="numLineCover"> 553</td> <td class="nbHitsCovered"> 37547</td> <td class="src"><pre class="src"> requestProcessingsFailureCount = 0;</pre></td></tr>
+<tr> <td class="numLineCover"> 554</td> <td class="nbHitsCovered"> 37547</td> <td class="src"><pre class="src"> requestProcessingsDurationSum = 0;</pre></td></tr>
+<tr> <td class="numLineCover"> 555</td> <td class="nbHitsCovered"> 37547</td> <td class="src"><pre class="src"> requestProcessingsMaxDuration = 0;</pre></td></tr>
+<tr> <td class="numLineCover"> 556</td> <td class="nbHitsCovered"> 37547</td> <td class="src"><pre class="src"> requestProcessingsThroughput = 0;</pre></td></tr>
+<tr> <td class="numLineCover"> 557</td> <td class="nbHitsCovered"> 37547</td> <td class="src"><pre class="src"> gsaRetrievedDocument = <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 558</td> <td class="nbHitsCovered"> 37547</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 559</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 560</td> <td class="nbHits"> </td>
@@ -931,7 +931,7 @@
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 568</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 569</td> <td class="nbHitsCovered"> 270</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">class</span> NegSizeFakeMap<K, V> <span class="keyword">extends</span> FakeMap<K, V> {</pre></td></tr>
+<tr> <td class="numLineCover"> 569</td> <td class="nbHitsCovered"> 276</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">class</span> NegSizeFakeMap<K, V> <span class="keyword">extends</span> FakeMap<K, V> {</pre></td></tr>
<tr> <td class="numLine"> 570</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 571</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.LoggingFilter.html b/coverage/com.google.enterprise.adaptor.LoggingFilter.html
index ba1fa93..7f7b054 100644
--- a/coverage/com.google.enterprise.adaptor.LoggingFilter.html
+++ b/coverage/com.google.enterprise.adaptor.LoggingFilter.html
@@ -73,7 +73,7 @@
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 28</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">/** Filter that logs requests and responses. */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 29</td> <td class="nbHitsCovered"> 48</td> <td class="src"><pre class="src"> <span class="keyword">class</span> LoggingFilter <span class="keyword">extends</span> Filter {</pre></td></tr>
+<tr> <td class="numLineCover"> 29</td> <td class="nbHitsCovered"> 49</td> <td class="src"><pre class="src"> <span class="keyword">class</span> LoggingFilter <span class="keyword">extends</span> Filter {</pre></td></tr>
<tr> <td class="numLineCover"> 30</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> Logger log</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> = Logger.getLogger(LoggingFilter.<span class="keyword">class</span>.getName());</pre></td></tr>
@@ -94,29 +94,29 @@
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> doFilter(HttpExchange ex, Filter.Chain chain) <span class="keyword">throws</span> IOException {</pre></td></tr>
<tr> <td class="numLine"> 40</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 41</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> log.fine(<span class="string">"beginning"</span>);</pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> logRequest(ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> log.log(Level.FINE, <span class="string">"Processing context for request is {0}"</span>,</pre></td></tr>
+<tr> <td class="numLineCover"> 41</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> log.fine(<span class="string">"beginning"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> logRequest(ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> log.log(Level.FINE, <span class="string">"Processing context for request is {0}"</span>,</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> ex.getHttpContext().getHandler().getClass().getName());</pre></td></tr>
-<tr> <td class="numLineCover"> 45</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> chain.doFilter(ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 45</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> chain.doFilter(ex);</pre></td></tr>
<tr> <td class="numLineCover"> 46</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (RuntimeException e) {</pre></td></tr>
<tr> <td class="numLineCover"> 47</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Unexpected exception during request"</span>, e);</pre></td></tr>
<tr> <td class="numLineCover"> 48</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> e;</pre></td></tr>
-<tr> <td class="numLineCover"> 49</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (IOException e) {</pre></td></tr>
-<tr> <td class="numLineCover"> 50</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Unexpected exception during request"</span>, e);</pre></td></tr>
-<tr> <td class="numLineCover"> 51</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> e;</pre></td></tr>
+<tr> <td class="numLineCover"> 49</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> } <span class="keyword">catch</span> (IOException e) {</pre></td></tr>
+<tr> <td class="numLineCover"> 50</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> log.log(Level.WARNING, <span class="string">"Unexpected exception during request"</span>, e);</pre></td></tr>
+<tr> <td class="numLineCover"> 51</td> <td class="nbHitsCovered"> 2</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> e;</pre></td></tr>
<tr> <td class="numLine"> 52</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr>
-<tr> <td class="numLineCover"> 53</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> logResponse(ex);</pre></td></tr>
-<tr> <td class="numLineCover"> 54</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> log.fine(<span class="string">"ending"</span>);</pre></td></tr>
+<tr> <td class="numLineCover"> 53</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> logResponse(ex);</pre></td></tr>
+<tr> <td class="numLineCover"> 54</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> log.fine(<span class="string">"ending"</span>);</pre></td></tr>
<tr> <td class="numLineCover"> 55</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLineCover"> 56</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 57</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 58</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> logRequest(HttpExchange ex) {</pre></td></tr>
-<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"><a title="Line 59: Conditional coverage 50% (1/2)."> 6</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 59: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (log.isLoggable(Level.FINER)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 59</td> <td class="nbHitsUncovered"><a title="Line 59: Conditional coverage 50% (1/2)."> 7</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 59: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (log.isLoggable(Level.FINER)) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 60</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.FINER, <span class="string">"Received {1} request to {0}. Headers: '{'{2}'}'"</span>,</span></pre></td></tr>
<tr> <td class="numLine"> 61</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">new</span> Object[] {ex.getRequestURI(), ex.getRequestMethod(),</pre></td></tr>
@@ -124,12 +124,12 @@
<td class="src"><pre class="src"> getLoggableHeaders(ex.getRequestHeaders())});</pre></td></tr>
<tr> <td class="numLine"> 63</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 64</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 65</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 66</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">void</span> logResponse(HttpExchange ex) {</pre></td></tr>
-<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"><a title="Line 67: Conditional coverage 50% (1/2)."> 6</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 67: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (log.isLoggable(Level.FINER)) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 67</td> <td class="nbHitsUncovered"><a title="Line 67: Conditional coverage 50% (1/2)."> 7</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 67: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (log.isLoggable(Level.FINER)) {</a></span></pre></td></tr>
<tr> <td class="numLineCover"> 68</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> log.log(Level.FINER, <span class="string">"Responded to {1} request {0}. Headers: '{'{2}'}'"</span>,</span></pre></td></tr>
<tr> <td class="numLine"> 69</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">new</span> Object[] {ex.getRequestURI(), ex.getRequestMethod(),</pre></td></tr>
@@ -137,7 +137,7 @@
<td class="src"><pre class="src"> getLoggableHeaders(ex.getResponseHeaders())});</pre></td></tr>
<tr> <td class="numLine"> 71</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"> 6</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 72</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 73</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 74</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.Principal.html b/coverage/com.google.enterprise.adaptor.Principal.html
index 87aa81f..c1b4c43 100644
--- a/coverage/com.google.enterprise.adaptor.Principal.html
+++ b/coverage/com.google.enterprise.adaptor.Principal.html
@@ -62,7 +62,7 @@
<td class="src"><pre class="src"> <span class="comment"> * Represents either a user or a group.</span></pre></td></tr>
<tr> <td class="numLine"> 21</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover"> 22</td> <td class="nbHitsCovered"> 670</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">abstract</span> <span class="keyword">class</span> Principal <span class="keyword">implements</span> Comparable<Principal> {</pre></td></tr>
+<tr> <td class="numLineCover"> 22</td> <td class="nbHitsCovered"> 672</td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">abstract</span> <span class="keyword">class</span> Principal <span class="keyword">implements</span> Comparable<Principal> {</pre></td></tr>
<tr> <td class="numLine"> 23</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DEFAULT_NAMESPACE = <span class="string">"Default"</span>;</pre></td></tr>
<tr> <td class="numLine"> 24</td> <td class="nbHits"> </td>
@@ -73,30 +73,30 @@
<td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> String namespace;</pre></td></tr>
<tr> <td class="numLine"> 27</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 28</td> <td class="nbHitsCovered"> 498</td> <td class="src"><pre class="src"> Principal(String n, String ns) {</pre></td></tr>
-<tr> <td class="numLineCover"> 29</td> <td class="nbHitsCovered"><a title="Line 29: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 498</a></td> <td class="src"><pre class="src"> <a title="Line 29: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (<span class="keyword">null</span> == n || <span class="keyword">null</span> == ns) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 28</td> <td class="nbHitsCovered"> 507</td> <td class="src"><pre class="src"> Principal(String n, String ns) {</pre></td></tr>
+<tr> <td class="numLineCover"> 29</td> <td class="nbHitsCovered"><a title="Line 29: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> 507</a></td> <td class="src"><pre class="src"> <a title="Line 29: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (<span class="keyword">null</span> == n || <span class="keyword">null</span> == ns) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 30</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> NullPointerException();</pre></td></tr>
<tr> <td class="numLine"> 31</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 32</td> <td class="nbHitsCovered"><a title="Line 32: Conditional coverage 100% (2/2)."> 494</a></td> <td class="src"><pre class="src"> <a title="Line 32: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (n.isEmpty()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 32</td> <td class="nbHitsCovered"><a title="Line 32: Conditional coverage 100% (2/2)."> 503</a></td> <td class="src"><pre class="src"> <a title="Line 32: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (n.isEmpty()) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 33</td> <td class="nbHitsCovered"> 3</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalArgumentException(<span class="string">"name cannot be empty"</span>);</pre></td></tr>
<tr> <td class="numLine"> 34</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 35</td> <td class="nbHitsCovered"><a title="Line 35: Conditional coverage 100% (2/2)."> 491</a></td> <td class="src"><pre class="src"> <a title="Line 35: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!n.trim().equals(n)) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 35</td> <td class="nbHitsCovered"><a title="Line 35: Conditional coverage 100% (2/2)."> 500</a></td> <td class="src"><pre class="src"> <a title="Line 35: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!n.trim().equals(n)) {</a></pre></td></tr>
<tr> <td class="numLineCover"> 36</td> <td class="nbHitsCovered"> 8</td> <td class="src"><pre class="src"> <span class="keyword">throw</span> <span class="keyword">new</span> IllegalArgumentException(<span class="string">"name \""</span> + n</pre></td></tr>
<tr> <td class="numLine"> 37</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> + <span class="string">"\" should not start or end with space"</span>);</pre></td></tr>
<tr> <td class="numLine"> 38</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
-<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"> 483</td> <td class="src"><pre class="src"> name = n;</pre></td></tr>
-<tr> <td class="numLineCover"> 40</td> <td class="nbHitsCovered"> 483</td> <td class="src"><pre class="src"> namespace = ns;</pre></td></tr>
-<tr> <td class="numLineCover"> 41</td> <td class="nbHitsCovered"> 483</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 39</td> <td class="nbHitsCovered"> 492</td> <td class="src"><pre class="src"> name = n;</pre></td></tr>
+<tr> <td class="numLineCover"> 40</td> <td class="nbHitsCovered"> 492</td> <td class="src"><pre class="src"> namespace = ns;</pre></td></tr>
+<tr> <td class="numLineCover"> 41</td> <td class="nbHitsCovered"> 492</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 42</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 43</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> Principal(String n) {</pre></td></tr>
-<tr> <td class="numLineCover"> 44</td> <td class="nbHitsCovered"> 366</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(n, DEFAULT_NAMESPACE);</pre></td></tr>
-<tr> <td class="numLineCover"> 45</td> <td class="nbHitsCovered"> 353</td> <td class="src"><pre class="src"> }</pre></td></tr>
+<tr> <td class="numLineCover"> 44</td> <td class="nbHitsCovered"> 375</td> <td class="src"><pre class="src"> <span class="keyword">this</span>(n, DEFAULT_NAMESPACE);</pre></td></tr>
+<tr> <td class="numLineCover"> 45</td> <td class="nbHitsCovered"> 362</td> <td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 46</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
<tr> <td class="numLine"> 47</td> <td class="nbHits"> </td>
@@ -167,24 +167,24 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 85</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">int</span> compareTo(Principal other) {</pre></td></tr>
-<tr> <td class="numLineCover"> 86</td> <td class="nbHitsCovered"> 670</td> <td class="src"><pre class="src"> <span class="keyword">int</span> spacecmp = namespace.compareTo(other.namespace);</pre></td></tr>
-<tr> <td class="numLineCover"> 87</td> <td class="nbHitsCovered"><a title="Line 87: Conditional coverage 100% (2/2)."> 670</a></td> <td class="src"><pre class="src"> <a title="Line 87: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (0 != spacecmp) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"> 164</td> <td class="src"><pre class="src"> <span class="keyword">return</span> spacecmp;</pre></td></tr>
+<tr> <td class="numLineCover"> 86</td> <td class="nbHitsCovered"> 672</td> <td class="src"><pre class="src"> <span class="keyword">int</span> spacecmp = namespace.compareTo(other.namespace);</pre></td></tr>
+<tr> <td class="numLineCover"> 87</td> <td class="nbHitsCovered"><a title="Line 87: Conditional coverage 100% (2/2)."> 672</a></td> <td class="src"><pre class="src"> <a title="Line 87: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (0 != spacecmp) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 88</td> <td class="nbHitsCovered"> 161</td> <td class="src"><pre class="src"> <span class="keyword">return</span> spacecmp;</pre></td></tr>
<tr> <td class="numLine"> 89</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 90</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// OK, same namespace</span></pre></td></tr>
<tr> <td class="numLine"> 91</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 92</td> <td class="nbHitsCovered"><a title="Line 92: Conditional coverage 100% (2/2)."> 506</a></td> <td class="src"><pre class="src"> <a title="Line 92: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (isUser() != other.isUser()) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"><a title="Line 93: Conditional coverage 100% (2/2)."> 48</a></td> <td class="src"><pre class="src"> <a title="Line 93: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> isUser() ? -1 : 1;</a></pre></td></tr>
+<tr> <td class="numLineCover"> 92</td> <td class="nbHitsCovered"><a title="Line 92: Conditional coverage 100% (2/2)."> 511</a></td> <td class="src"><pre class="src"> <a title="Line 92: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (isUser() != other.isUser()) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 93</td> <td class="nbHitsCovered"><a title="Line 93: Conditional coverage 100% (2/2)."> 52</a></td> <td class="src"><pre class="src"> <a title="Line 93: Conditional coverage 100% (2/2)."> <span class="keyword">return</span> isUser() ? -1 : 1;</a></pre></td></tr>
<tr> <td class="numLine"> 94</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 95</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// OK, same namespace and same type</span></pre></td></tr>
<tr> <td class="numLine"> 96</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> </pre></td></tr>
-<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 458</td> <td class="src"><pre class="src"> <span class="keyword">return</span> name.compareTo(other.name);</pre></td></tr>
+<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 459</td> <td class="src"><pre class="src"> <span class="keyword">return</span> name.compareTo(other.name);</pre></td></tr>
<tr> <td class="numLine"> 98</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 99</td> <td class="nbHits"> </td>
diff --git a/coverage/com.google.enterprise.adaptor.RedirectHandler.html b/coverage/com.google.enterprise.adaptor.RedirectHandler.html
index 3e6567c..63e5d82 100644
--- a/coverage/com.google.enterprise.adaptor.RedirectHandler.html
+++ b/coverage/com.google.enterprise.adaptor.RedirectHandler.html
@@ -12,7 +12,7 @@
<div class="separator"> </div>
<table class="report">
<thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead>
- <tr><td><a href="com.google.enterprise.adaptor.RedirectHandler.html">RedirectHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">10</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:23px"><span class="text">3/13</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">2</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:0px"><span class="text">0/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0;</span>3</td></tr>
+ <tr><td><a href="com.google.enterprise.adaptor.RedirectHandler.html">RedirectHandler</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">8</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:38px"><span class="text">5/13</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">1</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:50px"><span class="text">1/2</span></div></div></td></tr></table></td><td class="value"><span class="hidden">3.0;</span>3</td></tr>
</table>
<div class="separator"> </div>
@@ -96,8 +96,8 @@
<td class="src"><pre class="src"> @Override</pre></td></tr>
<tr> <td class="numLine"> 41</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">void</span> handle(HttpExchange ex) <span class="keyword">throws</span> IOException {</pre></td></tr>
-<tr> <td class="numLineCover"> 42</td> <td class="nbHitsUncovered"><a title="Line 42: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 42: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!ex.getRequestURI().getPath().equals(ex.getHttpContext().getPath())) {</a></span></pre></td></tr>
-<tr> <td class="numLineCover"> 43</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> HttpExchanges.cannedRespond(ex, HttpURLConnection.HTTP_NOT_FOUND,</span></pre></td></tr>
+<tr> <td class="numLineCover"> 42</td> <td class="nbHitsUncovered"><a title="Line 42: Conditional coverage 50% (1/2)."> 1</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 42: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (!ex.getRequestURI().getPath().equals(ex.getHttpContext().getPath())) {</a></span></pre></td></tr>
+<tr> <td class="numLineCover"> 43</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> HttpExchanges.cannedRespond(ex, HttpURLConnection.HTTP_NOT_FOUND,</pre></td></tr>
<tr> <td class="numLine"> 44</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> Translation.HTTP_NOT_FOUND);</pre></td></tr>
<tr> <td class="numLineCover"> 45</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span>;</span></pre></td></tr>
diff --git a/coverage/com.google.enterprise.adaptor.ShutdownWaiter.html b/coverage/com.google.enterprise.adaptor.ShutdownWaiter.html
index 898d216..104b35b 100644
--- a/coverage/com.google.enterprise.adaptor.ShutdownWaiter.html
+++ b/coverage/com.google.enterprise.adaptor.ShutdownWaiter.html
@@ -128,22 +128,22 @@
<tr> <td class="numLineCover"> 55</td> <td class="nbHitsCovered"> 19</td> <td class="src"><pre class="src"> stopped = <span class="keyword">true</span>;</pre></td></tr>
<tr> <td class="numLine"> 56</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Inform processing requests to shut down.</span></pre></td></tr>
-<tr> <td class="numLineCover"> 57</td> <td class="nbHitsCovered"><a title="Line 57: Conditional coverage 100% (2/2)."> 36</a></td> <td class="src"><pre class="src"> <a title="Line 57: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Thread thread : processingThreads.toArray(<span class="keyword">new</span> Thread[0])) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 58</td> <td class="nbHitsCovered"> 17</td> <td class="src"><pre class="src"> thread.interrupt();</pre></td></tr>
+<tr> <td class="numLineCover"> 57</td> <td class="nbHitsCovered"><a title="Line 57: Conditional coverage 100% (2/2)."> 41</a></td> <td class="src"><pre class="src"> <a title="Line 57: Conditional coverage 100% (2/2)."> <span class="keyword">for</span> (Thread thread : processingThreads.toArray(<span class="keyword">new</span> Thread[0])) {</a></pre></td></tr>
+<tr> <td class="numLineCover"> 58</td> <td class="nbHitsCovered"> 22</td> <td class="src"><pre class="src"> thread.interrupt();</pre></td></tr>
<tr> <td class="numLine"> 59</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> }</pre></td></tr>
<tr> <td class="numLine"> 60</td> <td class="nbHits"> </td>
<td class="src"><pre class="src"> <span class="comment">// Wait for all requests to complete processing.</span></pre></td></tr>
<tr> <td class="numLineCover"> 61</td> <td class="nbHitsCovered"><a title="Line 61: Conditional coverage 100% (2/2)."> 19</a></td> <td class="src"><pre class="src"> <a title="Line 61: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (!lock.writeLock().tryLock(time, unit)) {</a></pre></td></tr>
-<tr> <td class="numLineCover"> 62</td> <td class="nbHitsCovered"> 7</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">false</span>;</pre></td></tr>
+<tr> <td class="numLineCover"> 62</td> <td class="nbHitsCovered"> 10</td> <td class="src"><pre class="src"> <span cl