From c288afa8b6d44cf7e4f161652e5fc183cdee61c8 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 25 Aug 2010 16:03:55 +0200
Subject: [PATCH] Refining names

---
 akka-core/src/main/scala/dispatch/Queues.scala | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/akka-core/src/main/scala/dispatch/Queues.scala b/akka-core/src/main/scala/dispatch/Queues.scala
index 5a5d40efbc..ddb556904c 100644
--- a/akka-core/src/main/scala/dispatch/Queues.scala
+++ b/akka-core/src/main/scala/dispatch/Queues.scala
@@ -11,17 +11,14 @@ import se.scalablesolutions.akka.util.Logger
 
 class BoundedTransferQueue[E <: AnyRef](
         val capacity: Int,
-        val defaultTimeout: Long,
-        val defaultTimeUnit: TimeUnit)
+        val pushTimeout: Long,
+        val pushTimeUnit: TimeUnit)
       extends LinkedTransferQueue[E] {
   
   protected val guard = new Semaphore(capacity)
   
-  protected def enq(
-          f: => Boolean,
-          timeout: Long = defaultTimeout,
-          unit: TimeUnit = defaultTimeUnit): Boolean = {
-    if (guard.tryAcquire(timeout,unit)) {
+  protected def enq(f: => Boolean): Boolean = {
+    if (guard.tryAcquire(pushTimeout,pushTimeUnit)) {
       val result = try {
         f
       } catch {
@@ -54,7 +51,7 @@ class BoundedTransferQueue[E <: AnyRef](
     enq(super.offer(e))
 
   override def offer(e: E, timeout: Long, unit: TimeUnit): Boolean =
-    enq(super.offer(e,timeout,unit), timeout, unit)
+    enq(super.offer(e,timeout,unit))
 
   override def add(e: E): Boolean =
     enq(super.add(e))
@@ -66,7 +63,7 @@ class BoundedTransferQueue[E <: AnyRef](
     enq(super.tryTransfer(e))
 
   override def tryTransfer(e: E, timeout: Long, unit: TimeUnit): Boolean =
-    enq(super.tryTransfer(e,timeout,unit),timeout,unit)
+    enq(super.tryTransfer(e,timeout,unit))
   
   override def transfer(e: E): Unit =
     enq({ super.transfer(e); true })
@@ -78,7 +75,7 @@ class BoundedTransferQueue[E <: AnyRef](
       def next = it.next
       def remove {
         it.remove
-        guard.release
+        guard.release //Assume remove worked if no exception was thrown
       }
     }
   }