svn commit: r1482933 - in /commons/proper/pool/branches/POOL_1_X/src: java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java java/org/apache/commons/pool/impl/GenericObjectPool.java test/org/apache/commons/pool/MethodCall.java

[ggregory]

Author: ggregory
Date: Wed May 15 16:18:23 2013
New Revision: 1482933

URL: http://svn.apache.org/r1482933
Log:
Convert control statement bodies to block.

Modified:
    
commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java
    
commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPool.java
    
commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/MethodCall.java

Modified: 
commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java?rev=1482933&r1=1482932&r2=1482933&view=diff
==============================================================================
--- 
commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java
 (original)
+++ 
commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java
 Wed May 15 16:18:23 2013
@@ -1297,7 +1297,9 @@ public class GenericKeyedObjectPool<K, V
         boolean clearOldest = false;
 
         synchronized (this) {
-            if (isClosed()) return;
+            if (isClosed()) {
+                return;
+            }
 
             Iterator<Latch<K, V>> allocationQueueIter = 
_allocationQueue.iterator();
 

Modified: 
commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPool.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPool.java?rev=1482933&r1=1482932&r2=1482933&view=diff
==============================================================================
--- 
commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPool.java
 (original)
+++ 
commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/impl/GenericObjectPool.java
 Wed May 15 16:18:23 2013
@@ -1258,7 +1258,9 @@ public class GenericObjectPool<T> extend
      * this method should not be called from inside a sync block.
      */
     private synchronized void allocate() {
-        if (isClosed()) return;
+        if (isClosed()) {
+            return;
+        }
 
         // First use any objects in the pool to clear the queue
         for (;;) {

Modified: 
commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/MethodCall.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/MethodCall.java?rev=1482933&r1=1482932&r2=1482933&view=diff
==============================================================================
--- 
commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/MethodCall.java
 (original)
+++ 
commons/proper/pool/branches/POOL_1_X/src/test/org/apache/commons/pool/MethodCall.java
 Wed May 15 16:18:23 2013
@@ -79,14 +79,24 @@ public class MethodCall {
 
     @Override
     public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         final MethodCall that = (MethodCall)o;
 
-        if (name != null ? !name.equals(that.name) : that.name != null) return 
false;
-        if (params != null ? !params.equals(that.params) : that.params != 
null) return false;
-        if (returned != null ? !returned.equals(that.returned) : that.returned 
!= null) return false;
+        if (name != null ? !name.equals(that.name) : that.name != null) {
+            return false;
+        }
+        if (params != null ? !params.equals(that.params) : that.params != 
null) {
+            return false;
+        }
+        if (returned != null ? !returned.equals(that.returned) : that.returned 
!= null) {
+            return false;
+        }
 
         return true;
     }