Fixed comments, replaced a testcase check

Fixes twitter#524
maheshkelkar · Jul 14, 2016 · 938d3d7 · 938d3d7
1 parent 8be77c3
commit 938d3d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/finagle-core/src/main/scala/com/twitter/finagle/service/FailureAccrualFactory.scala b/finagle-core/src/main/scala/com/twitter/finagle/service/FailureAccrualFactory.scala
@@ -1,6 +1,5 @@
 package com.twitter.finagle.service
 
-import java.net.InetSocketAddress
 import com.twitter.conversions.time._
 import com.twitter.finagle.Stack.{Params, Role}
 import com.twitter.finagle._
@@ -311,8 +310,8 @@ class FailureAccrualFactory[Req, Rep](
   /**
     * Exit 'Probing' state (if necessary)
     *
-    * The follow-on operation (i.e. the result of first request while probing) will determine
-    * whether the factory transitions to Alive (successful) or Dead (unsuccessful).
+    * The result of the subsequent request will determine whether the factory transitions to
+    * Alive (successful) or Dead (unsuccessful).
     */
   private[this] def stopProbing() = self.synchronized {
     state match {
@@ -337,7 +336,6 @@ class FailureAccrualFactory[Req, Rep](
           // (unsuccessful).
           stopProbing()
 
-          // Invoke service
           service(request).respond { rep =>
             if (isSuccess(ReqRep(request, rep))) didSucceed()
             else didFail()

diff --git a/finagle-core/src/test/scala/com/twitter/finagle/service/FailureAccrualFactoryTest.scala b/finagle-core/src/test/scala/com/twitter/finagle/service/FailureAccrualFactoryTest.scala
@@ -182,7 +182,8 @@ class FailureAccrualFactoryTest extends FunSuite with MockitoSugar {
         intercept[Exception] {
           Await.result(service(123))
         }
-        assert(statsReceiver.counters.get(List("probes")).getOrElse(0) >= 1)
+        val probeStat = statsReceiver.counters.get(List("probes"))
+        assert(probeStat.isDefined && probeStat.get >= 1)
       }
     }
   }