Author: markt
Date: Fri May 24 14:10:28 2013
New Revision: 1486064
URL: http://svn.apache.org/r1486064
Log:
Modify test to check onAllDataRead() is called correctly
Modified:
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
Modified:
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java?rev=1486064&r1=1486063&r2=1486064&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
Fri May 24 14:10:28 2013
@@ -332,7 +332,8 @@ public class TestNonBlockingAPI extends
}
private class TestReadListener implements ReadListener {
- AsyncContext ctx;
+ private final AsyncContext ctx;
+ private final StringBuilder body = new StringBuilder();
public TestReadListener(AsyncContext ctx) {
this.ctx = ctx;
@@ -353,23 +354,28 @@ public class TestNonBlockingAPI extends
s += new String(b, 0, read);
} while (in.isReady());
System.out.println(s);
- if (s.endsWith("FINISHED")) {
- ctx.complete();
- ctx.getResponse().getWriter().print("OK");
- } else {
- in.isReady();
- }
+ body.append(s);
} catch (Exception x) {
x.printStackTrace();
ctx.complete();
}
-
}
@Override
public void onAllDataRead() {
System.out.println("onAllDataRead");
-
+ String msg;
+ if (body.toString().endsWith("FINISHED")) {
+ msg = "OK";
+ } else {
+ msg = "FAILED";
+ }
+ try {
+ ctx.getResponse().getWriter().print(msg);
+ } catch (IOException ioe) {
+ // Ignore
+ }
+ ctx.complete();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
