commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pste...@apache.org
Subject svn commit: r611708 - in /commons/sandbox/performance/trunk: build-pool.xml src/java/org/apache/commons/performance/LoadGenerator.java src/java/org/apache/commons/performance/pool/PoolSoak.java
Date Mon, 14 Jan 2008 04:53:00 GMT
Author: psteitz
Date: Sun Jan 13 20:52:58 2008
New Revision: 611708

URL: http://svn.apache.org/viewvc?rev=611708&view=rev
Log:
Updated digester version, fixed some errors in r611706.

Modified:
    commons/sandbox/performance/trunk/build-pool.xml
    commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/LoadGenerator.java
    commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/pool/PoolSoak.java

Modified: commons/sandbox/performance/trunk/build-pool.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/build-pool.xml?rev=611708&r1=611707&r2=611708&view=diff
==============================================================================
--- commons/sandbox/performance/trunk/build-pool.xml (original)
+++ commons/sandbox/performance/trunk/build-pool.xml Sun Jan 13 20:52:58 2008
@@ -63,8 +63,8 @@
 
   <target name="get-digester">
     <get
-    src="${mavenRepo}/commons-digester/commons-digester/1.4.1/commons-digester-1.4.1.jar"
-    dest="${lib}/commons-digester-1.4.1.jar"
+    src="${mavenRepo}/commons-digester/commons-digester/1.8/commons-digester-1.8.jar"
+    dest="${lib}/commons-digester-1.8.jar"
     usetimestamp="true"/>
   </target>
 

Modified: commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/LoadGenerator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/LoadGenerator.java?rev=611708&r1=611707&r2=611708&view=diff
==============================================================================
--- commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/LoadGenerator.java
(original)
+++ commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/LoadGenerator.java
Sun Jan 13 20:52:58 2008
@@ -17,6 +17,7 @@
 
 package org.apache.commons.performance;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -93,7 +94,7 @@
      */
     public void execute() throws Exception {
         configure();
-        digester.parse(configFile);
+        digester.parse(new File(configFile));
         init();
         // Spawn and execute client threads
 		ExecutorService ex = Executors.newFixedThreadPool((int)numClients);

Modified: commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/pool/PoolSoak.java
URL: http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/pool/PoolSoak.java?rev=611708&r1=611707&r2=611708&view=diff
==============================================================================
--- commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/pool/PoolSoak.java
(original)
+++ commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/pool/PoolSoak.java
Sun Jan 13 20:52:58 2008
@@ -147,8 +147,7 @@
         
         // Create object pool
         if (poolType.equals("GenericObjectPool")) {
-            genericObjectPool = new GenericObjectPool();
-            genericObjectPool = new AbandonedObjectPool(null,abandonedConfig);
+            genericObjectPool = new GenericObjectPool(factory);
             genericObjectPool.setMaxActive(maxActive);
             genericObjectPool.setWhenExhaustedAction(exhaustedAction);
             genericObjectPool.setMaxWait(maxWait);
@@ -162,7 +161,6 @@
             genericObjectPool.setMinEvictableIdleTimeMillis(idleTimeout);
             genericObjectPool.setTestWhileIdle(testWhileIdle);
             genericObjectPool.setLifo(lifo);
-            genericObjectPool.setFactory(factory);
         } else if (poolType.equals("AbandonedObjectPool")) {
             genericObjectPool = new AbandonedObjectPool(null,abandonedConfig);
             genericObjectPool.setMaxActive(maxActive);
@@ -240,7 +238,7 @@
             long peakPeriod, long troughPeriod, String cycleType, 
             String rampType, Logger logger, 
             List <SummaryStatistics> statsList) {
-        if (poolType.equals("GenercObjectPool")) {
+        if (poolType.equals("GenericObjectPool")) {
             return new PoolClientThread(iterations, minDelay, maxDelay,
                     sigma, delayType, rampPeriod, peakPeriod, troughPeriod,
                     cycleType, rampType, logger, statsList, genericObjectPool);



Mime
View raw message