You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2012/04/24 21:20:19 UTC
svn commit: r1329953 - in
/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl:
GenericKeyedObjectPool.java GenericObjectPool.java
Author: markt
Date: Tue Apr 24 19:20:19 2012
New Revision: 1329953
URL: http://svn.apache.org/viewvc?rev=1329953&view=rev
Log:
Remove unnecessary Javadoc
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1329953&r1=1329952&r2=1329953&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java Tue Apr 24 19:20:19 2012
@@ -280,12 +280,12 @@ public class GenericKeyedObjectPool<K,T>
this.jmxNotificationSupport = null;
}
this.oname = onameTemp;
-
+
// Populate the swallowed exceptions queue
for (int i = 0; i < SWALLOWED_EXCEPTION_QUEUE_SIZE; i++) {
swallowedExceptions.add(null);
}
-
+
// Populate the creation stack trace
this.creationStackTrace = getStackTrace(new Exception());
}
@@ -440,7 +440,7 @@ public class GenericKeyedObjectPool<K,T>
* If the configured value of minIdlePerKey is greater than the configured
* value for maxIdlePerKey then the value of maxIdlePerKey will be used
* instead.
- *
+ *
* @param poolSize - The minimum size of the each keyed pool
* @since Pool 1.3
* @see #getMinIdlePerKey
@@ -460,7 +460,7 @@ public class GenericKeyedObjectPool<K,T>
* If the configured value of minIdlePerKey is greater than the configured
* value for maxIdlePerKey then the value of maxIdlePerKey will be used
* instead.
- *
+ *
* @return minimum size of the each keyed pool
* @since Pool 1.3
* @see #setTimeBetweenEvictionRunsMillis
@@ -726,7 +726,7 @@ public class GenericKeyedObjectPool<K,T>
*
* @return <code>true</code> if the pools are configured to act as LIFO
* queues or <code>false</code> if the pools are configured to act
- * as FIFO queues
+ * as FIFO queues
* @since 1.4
*/
@Override
@@ -968,7 +968,7 @@ public class GenericKeyedObjectPool<K,T>
* <p>
* Exceptions encountered destroying objects for any reason are swallowed.
* </p>
- *
+ *
* @param key pool key
* @param obj instance to return to the keyed pool
*/
@@ -1048,7 +1048,7 @@ public class GenericKeyedObjectPool<K,T>
activeTimes.poll();
}
}
-
+
private void swallowException(Exception e) {
String msg = getStackTrace(e);
@@ -1057,7 +1057,7 @@ public class GenericKeyedObjectPool<K,T>
oname, swallowedExcpetionCount.incrementAndGet(), msg);
jmxNotificationSupport.sendNotification(n);
}
-
+
// Add the exception the queue, removing the oldest
synchronized (swallowedExceptions) {
swallowedExceptions.addLast(msg);
@@ -1074,7 +1074,7 @@ public class GenericKeyedObjectPool<K,T>
e.printStackTrace(pw);
return w.toString();
}
-
+
/**
* {@inheritDoc}
@@ -1787,7 +1787,7 @@ public class GenericKeyedObjectPool<K,T>
* <p>Calls {@link #allocate()} on successful completion.</p>
*
* <p>Callers are responsible for registering and deregistering the key.</p>
- *
+ *
* @param key pool key
* @param p instance to add to the keyed pool
* @throws Exception
@@ -2110,7 +2110,7 @@ public class GenericKeyedObjectPool<K,T>
jmxNotificationSupport.removeNotificationListener(
listener, filter, handback);
}
-
+
public ObjectName getJmxName() {
return oname;
}
@@ -2119,7 +2119,7 @@ public class GenericKeyedObjectPool<K,T>
public String getCreationStackTrace() {
return creationStackTrace;
}
-
+
//--- inner classes ----------------------------------------------
/**
@@ -2194,7 +2194,7 @@ public class GenericKeyedObjectPool<K,T>
/**
* The idle object evictor {@link TimerTask}.
- *
+ *
* @see GenericKeyedObjectPool#setTimeBetweenEvictionRunsMillis
*/
private class Evictor extends TimerTask {
@@ -2391,7 +2391,6 @@ public class GenericKeyedObjectPool<K,T>
private volatile long softMinEvictableIdleTimeMillis =
GenericKeyedObjectPoolConfig.DEFAULT_SOFT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
- /** Whether or not the pools behave as LIFO queues. */
private boolean lifo = GenericKeyedObjectPoolConfig.DEFAULT_LIFO;
/** My {@link KeyedPoolableObjectFactory}. */
@@ -2484,11 +2483,11 @@ public class GenericKeyedObjectPool<K,T>
private static final int SWALLOWED_EXCEPTION_QUEUE_SIZE = 10;
private final Deque<String> swallowedExceptions = new LinkedList<String>();
private final AtomicInteger swallowedExcpetionCount = new AtomicInteger(0);
-
+
private final ObjectName oname;
private final NotificationBroadcasterSupport jmxNotificationSupport;
private final String creationStackTrace;
-
+
private static final String ONAME_BASE =
"org.apache.commoms.pool2:type=GenericKeyedObjectPool,name=";
}
Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1329953&r1=1329952&r2=1329953&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java Tue Apr 24 19:20:19 2012
@@ -247,12 +247,12 @@ public class GenericObjectPool<T> extend
this.jmxNotificationSupport = null;
}
this.oname = onameTemp;
-
+
// Populate the swallowed exceptions queue
for (int i = 0; i < SWALLOWED_EXCEPTION_QUEUE_SIZE; i++) {
swallowedExceptions.add(null);
}
-
+
// Populate the creation stack trace
this.creationStackTrace = getStackTrace(new Exception());
}
@@ -381,7 +381,7 @@ public class GenericObjectPool<T> extend
* <code>timeBetweenEvictionRunsMillis <= 0</code>).
* <p>
* If the configured value of minIdle is greater than the configured value
- * for maxIdle then the value of maxIdle will be used instead.
+ * for maxIdle then the value of maxIdle will be used instead.
*
* @param minIdle
* The minimum number of objects.
@@ -398,7 +398,7 @@ public class GenericObjectPool<T> extend
* created when: numActive + numIdle >= maxActive)
* <p>
* If the configured value of minIdle is greater than the configured value
- * for maxIdle then the value of maxIdle will be used instead.
+ * for maxIdle then the value of maxIdle will be used instead.
*
* @return The minimum number of objects.
* @see #setMinIdle
@@ -725,7 +725,7 @@ public class GenericObjectPool<T> extend
/**
* <p>Borrows an object from the pool.</p>
- *
+ *
* <p>If there is one or more idle instance available in the pool, then an
* idle instance will be selected based on the value of {@link #getLifo()},
* activated and returned. If activation fails, or {@link #getTestOnBorrow()
@@ -979,13 +979,13 @@ public class GenericObjectPool<T> extend
private void swallowException(Exception e) {
String msg = getStackTrace(e);
-
+
if (oname != null) {
Notification n = new Notification(NOTIFICATION_SWALLOWED_EXCEPTION,
oname, swallowedExcpetionCount.incrementAndGet(), msg);
jmxNotificationSupport.sendNotification(n);
}
-
+
// Add the exception the queue, removing the oldest
synchronized (swallowedExceptions) {
swallowedExceptions.addLast(msg);
@@ -1515,7 +1515,7 @@ public class GenericObjectPool<T> extend
public ObjectName getJmxName() {
return oname;
}
-
+
@Override
public String getCreationStackTrace() {
return creationStackTrace;
@@ -1710,7 +1710,6 @@ public class GenericObjectPool<T> extend
private volatile long softMinEvictableIdleTimeMillis =
GenericObjectPoolConfig.DEFAULT_SOFT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
- /** Whether or not the pool behaves as a LIFO queue. */
private volatile boolean lifo = GenericObjectPoolConfig.DEFAULT_LIFO;
/** My {@link PoolableObjectFactory}. */
@@ -1784,7 +1783,7 @@ public class GenericObjectPool<T> extend
private static final int SWALLOWED_EXCEPTION_QUEUE_SIZE = 10;
private final Deque<String> swallowedExceptions = new LinkedList<String>();
private final AtomicInteger swallowedExcpetionCount = new AtomicInteger(0);
-
+
private final ObjectName oname;
private final NotificationBroadcasterSupport jmxNotificationSupport;
private final String creationStackTrace;