Author: markt
Date: Mon Aug 15 16:54:51 2011
New Revision: 1157909

URL: http://svn.apache.org/viewvc?rev=1157909&view=rev
Log:
Fix benchmark tests

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 15 16:54:51 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157810,1157832,1157834,1157847
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157810,1157832,1157834,1157847,1157908

Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java?rev=1157909&r1=1157908&r2=1157909&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java 
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java Mon 
Aug 15 16:54:51 2011
@@ -72,7 +72,11 @@ public class Benchmarks {
 
         // Create a default session manager
         StandardManager mgr = new StandardManager();
-        mgr.startInternal();
+        try {
+            mgr.startInternal();
+        } catch (LifecycleException e) {
+            // Ignore - this is expected
+        }
         mgr.generateSessionId();
         while (mgr.sessionCreationTiming.size() <
                 ManagerBase.TIMING_STATS_CACHE_SIZE) {
@@ -164,7 +168,11 @@ public class Benchmarks {
 
         // Create a default session manager
         StandardManager mgr = new StandardManager();
-        mgr.startInternal();
+        try {
+            mgr.startInternal();
+        } catch (LifecycleException e) {
+            // Ignore - this is expected
+        }
         mgr.setContainer(new StandardContext());
         mgr.generateSessionId();
         while (mgr.sessionCreationTiming.size() <



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

Reply via email to