Commit cb60e48f authored by huni's avatar huni

A correction on overactivity check.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches/gsoc@10629 b35dd754-fafc-0310-a699-88a17e54d16e
parent 2e0e2510
...@@ -251,7 +251,6 @@ public class HttpBindServlet extends HttpServlet { ...@@ -251,7 +251,6 @@ public class HttpBindServlet extends HttpServlet {
} }
else { else {
session.resetInactivityTimeout(); session.resetInactivityTimeout();
session.setLastResponseEmpty(false);
connection.setContinuation(ContinuationSupport.getContinuation(request, connection)); connection.setContinuation(ContinuationSupport.getContinuation(request, connection));
request.setAttribute("request-session", connection.getSession()); request.setAttribute("request-session", connection.getSession());
request.setAttribute("request", connection.getRequestId()); request.setAttribute("request", connection.getRequestId());
...@@ -304,7 +303,7 @@ public class HttpBindServlet extends HttpServlet { ...@@ -304,7 +303,7 @@ public class HttpBindServlet extends HttpServlet {
} }
catch (HttpBindTimeoutException e) { catch (HttpBindTimeoutException e) {
content = createEmptyBody(); content = createEmptyBody();
connection.getSession().setLastResponseEmpty(false); connection.getSession().setLastResponseEmpty(true);
} }
respond(response, content, method); respond(response, content, method);
......
...@@ -808,6 +808,7 @@ public class HttpSession extends LocalClientSession { ...@@ -808,6 +808,7 @@ public class HttpSession extends LocalClientSession {
errorMessage += ", minimum polling interval is " errorMessage += ", minimum polling interval is "
+ maxPollingInterval + ", current interval " + ((time - lastPoll) / 1000); + maxPollingInterval + ", current interval " + ((time - lastPoll) / 1000);
} }
setLastResponseEmpty(false);
if(overactivity) { if(overactivity) {
Log.debug(errorMessage); Log.debug(errorMessage);
...@@ -867,6 +868,8 @@ public class HttpSession extends LocalClientSession { ...@@ -867,6 +868,8 @@ public class HttpSession extends LocalClientSession {
builder.append(" ack='" + ack + "'"); builder.append(" ack='" + ack + "'");
builder.append(">"); builder.append(">");
setLastResponseEmpty(elements.size() == 0);
for (Deliverable child : elements) { for (Deliverable child : elements) {
builder.append(child.getDeliverable()); builder.append(child.getDeliverable());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment