Replace guard clause with nested conditional

David McGuire · David McGuire · commit 82ee46ddeea5 · 2015-04-17T11:45:15.000-07:00
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/receiver/RateLimiter.scala b/streaming/src/main/scala/org/apache/spark/streaming/receiver/RateLimiter.scala
@@ -37,9 +37,8 @@ private[receiver] abstract class RateLimiter(conf: SparkConf) extends Logging {
   private lazy val rateLimiter = GuavaRateLimiter.create(desiredRate)
 
   def waitToPush() {
-    if( desiredRate <= 0 ) {
-      return
+    if( desiredRate > 0 ) {
+      rateLimiter.acquire()
     }
-    rateLimiter.acquire()
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,8 @@ private[receiver] abstract class RateLimiter(conf: SparkConf) extends Logging {`
`37`	`37`	`private lazy val rateLimiter = GuavaRateLimiter.create(desiredRate)`
`38`	`38`
`39`	`39`	`def waitToPush() {`
`40`		`- if( desiredRate <= 0 ) {`
`41`		`- return`
	`40`	`+ if( desiredRate > 0 ) {`
	`41`	`+ rateLimiter.acquire()`
`42`	`42`	`}`
`43`		`- rateLimiter.acquire()`
`44`	`43`	`}`
`45`	`44`	`}`