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 2014/01/17 18:13:32 UTC
svn commit: r1559189 -
/cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Author: dkulp
Date: Fri Jan 17 17:13:32 2014
New Revision: 1559189
URL: http://svn.apache.org/r1559189
Log:
Merged revisions 1559175 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1559175 | dkulp | 2014-01-17 11:41:36 -0500 (Fri, 17 Jan 2014) | 10 lines
Merged revisions 1559156 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1559156 | dkulp | 2014-01-17 10:45:52 -0500 (Fri, 17 Jan 2014) | 2 lines
Put a limit on the size of the output we record to limit memory usage for longer running tests that spit out a ton of info.
........
........
Modified:
cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Modified: cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=1559189&r1=1559188&r2=1559189&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java (original)
+++ cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java Fri Jan 17 17:13:32 2014
@@ -326,6 +326,9 @@ public class ServerLauncher {
ps.flush();
}
}
+ if (serverOutputAll.length() > 64000) {
+ serverOutputAll.delete(0, 10000);
+ }
}
ps.close();
} catch (IOException ex) {