Author: remy.maucherat(a)jboss.com Date: 2010-04-14 09:34:47 -0400 (Wed, 14 Apr 2010) New Revision: 1435 Modified: trunk/java/org/apache/catalina/connector/CoyoteReader.java trunk/java/org/apache/catalina/session/StandardManager.java trunk/webapps/docs/changelog.xml Log: - JBWEB-165: Ooops. - Port patch. Modified: trunk/java/org/apache/catalina/connector/CoyoteReader.java =================================================================== --- trunk/java/org/apache/catalina/connector/CoyoteReader.java 2010-04-12 11:05:36 UTC (rev 1434) +++ trunk/java/org/apache/catalina/connector/CoyoteReader.java 2010-04-14 13:34:47 UTC (rev 1435) @@ -156,8 +156,8 @@ mark(MAX_LINE_LENGTH); while ((pos < MAX_LINE_LENGTH) && (end < 0)) { int nRead = read(lineBuffer, pos, MAX_LINE_LENGTH - pos); - if (nRead < 0 && aggregator == null) { - if (pos == 0) { + if (nRead < 0) { + if (pos == 0 && aggregator == null) { return null; } end = pos; Modified: trunk/java/org/apache/catalina/session/StandardManager.java =================================================================== --- trunk/java/org/apache/catalina/session/StandardManager.java 2010-04-12 11:05:36 UTC (rev 1434) +++ trunk/java/org/apache/catalina/session/StandardManager.java 2010-04-14 13:34:47 UTC (rev 1435) @@ -393,9 +393,11 @@ StandardSession session = getNewSession(); session.readObjectData(ois); session.setManager(this); - sessions.put(session.getIdInternal(), session); - session.activate(); - sessionCounter++; + if (session.isValidInternal()) { + sessions.put(session.getIdInternal(), session); + session.activate(); + sessionCounter++; + } } } catch (ClassNotFoundException e) { log.error(sm.getString("standardManager.loading.cnfe", e), e); Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2010-04-12 11:05:36 UTC (rev 1434) +++ trunk/webapps/docs/changelog.xml 2010-04-14 13:34:47 UTC (rev 1435) @@ -22,6 +22,9 @@ <update> More standalone code removal. (remm) </update> + <fix> + <jira>165</jira>: Correct fix for <bug>42727</bug>. (remm) + </fix> </changelog> </subsection> <subsection name="Jasper">