Author: dkulp
Date: Fri Jan 17 16:41:36 2014
New Revision: 1559175
URL: http://svn.apache.org/r1559175
Log:
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.7.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Modified:
cxf/branches/2.7.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=1559175&r1=1559174&r2=1559175&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
(original)
+++
cxf/branches/2.7.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Fri Jan 17 16:41:36 2014
@@ -327,6 +327,9 @@ public class ServerLauncher {
ps.flush();
}
}
+ if (serverOutputAll.length() > 64000) {
+ serverOutputAll.delete(0, 10000);
+ }
}
} catch (IOException ex) {
if (!ex.getMessage().contains("Stream closed")) {
