You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/09/26 02:41:41 UTC
svn commit: r819075 - in /cxf/branches/2.1.x-fixes: ./
systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java
Author: dkulp
Date: Sat Sep 26 00:41:40 2009
New Revision: 819075
URL: http://svn.apache.org/viewvc?rev=819075&view=rev
Log:
Merged revisions 818949 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................
r818949 | dkulp | 2009-09-25 14:48:50 -0400 (Fri, 25 Sep 2009) | 9 lines
Merged revisions 818939 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r818939 | dkulp | 2009-09-25 14:20:14 -0400 (Fri, 25 Sep 2009) | 1 line
Remove a spurious stack trace appearing in the test logs
........
................
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java?rev=819075&r1=819074&r2=819075&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java (original)
+++ cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java Sat Sep 26 00:41:40 2009
@@ -60,7 +60,11 @@
public void testFallbackThreadPoolConfig() throws Exception {
Runnable r = new Runnable() {
public void run() {
- greeter.greetMeLater(5 * 1000);
+ try {
+ greeter.greetMeLater(5 * 1000);
+ } catch (Throwable t) {
+ //ignore
+ }
}
};
Thread[] invokers = new Thread[5];