Author: markt
Date: Thu Jul 10 07:22:24 2014
New Revision: 1609411

URL: http://svn.apache.org/r1609411
Log:
Whitespace police after merges

Modified:
    
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
    
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java
    
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolMXBean.java
    
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/InterruptibleReentrantLock.java
    tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java?rev=1609411&r1=1609410&r2=1609411&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java 
Thu Jul 10 07:22:24 2014
@@ -249,7 +249,7 @@ public abstract class BaseGenericObjectP
     public final boolean getLifo() {
         return lifo;
     }
-    
+
     /**
      * Returns whether or not the pool serves threads waiting to borrow 
objects fairly.
      * True means that waiting threads are served as if waiting in a FIFO 
queue.

Modified: 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java?rev=1609411&r1=1609410&r2=1609411&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java 
Thu Jul 10 07:22:24 2014
@@ -33,7 +33,7 @@ public abstract class BaseObjectPoolConf
      * @see GenericKeyedObjectPool#getLifo()
      */
     public static final boolean DEFAULT_LIFO = true;
-    
+
     /**
      * The default value for the {@code fairness} configuration attribute.
      * @see GenericObjectPool#getFairness()
@@ -153,7 +153,7 @@ public abstract class BaseObjectPoolConf
 
 
     private boolean lifo = DEFAULT_LIFO;
-    
+
     private boolean fairness = DEFAULT_FAIRNESS;
 
     private long maxWaitMillis = DEFAULT_MAX_WAIT_MILLIS;
@@ -203,7 +203,7 @@ public abstract class BaseObjectPoolConf
     public boolean getLifo() {
         return lifo;
     }
-    
+
     /**
      * Get the value for the {@code fairness} configuration attribute for pools
      * created with this configuration instance.
@@ -231,7 +231,7 @@ public abstract class BaseObjectPoolConf
     public void setLifo(boolean lifo) {
         this.lifo = lifo;
     }
-    
+
     /**
      * Set the value for the {@code fairness} configuration attribute for pools
      * created with this configuration instance.

Modified: 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolMXBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolMXBean.java?rev=1609411&r1=1609410&r2=1609411&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolMXBean.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolMXBean.java
 Thu Jul 10 07:22:24 2014
@@ -41,7 +41,7 @@ public interface GenericObjectPoolMXBean
      * See {@link GenericObjectPool#getLifo()}
      * @return See {@link GenericObjectPool#getLifo()}
      */
-    boolean getFairness();  
+    boolean getFairness();
     /**
      * See {@link GenericObjectPool#getFairness()}
      * @return See {@link GenericObjectPool#getFairness()}

Modified: 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/InterruptibleReentrantLock.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/InterruptibleReentrantLock.java?rev=1609411&r1=1609410&r2=1609411&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/InterruptibleReentrantLock.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/InterruptibleReentrantLock.java
 Thu Jul 10 07:22:24 2014
@@ -35,7 +35,7 @@ class InterruptibleReentrantLock extends
 
     /**
      * Create a new InterruptibleReentrantLock with the given fairness policy.
-     * 
+     *
      * @param fairness true means threads should acquire contended locks as if
      * waiting in a FIFO queue
      */

Modified: 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java?rev=1609411&r1=1609410&r2=1609411&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java 
Thu Jul 10 07:22:24 2014
@@ -161,7 +161,7 @@ class LinkedBlockingDeque<E> extends Abs
     public LinkedBlockingDeque() {
         this(Integer.MAX_VALUE);
     }
-    
+
     /**
      * Creates a {@code LinkedBlockingDeque} with a capacity of
      * {@link Integer#MAX_VALUE} and the given fairness policy.
@@ -181,7 +181,7 @@ class LinkedBlockingDeque<E> extends Abs
     public LinkedBlockingDeque(int capacity) {
         this(capacity, false);
     }
-    
+
     /**
      * Creates a {@code LinkedBlockingDeque} with the given (fixed) capacity
      * and fairness policy.



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to