Author: fschumacher Date: Tue Oct 14 12:18:09 2014 New Revision: 1631730 URL: http://svn.apache.org/r1631730 Log: Avoid possible integer overflows reported by Coverity Scan
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1631730&r1=1631729&r2=1631730&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Tue Oct 14 12:18:09 2014 @@ -850,7 +850,7 @@ public class DeltaManager extends Cluste // } reqNow = System.currentTimeMillis(); - isTimeout = ((reqNow - reqStart) > (1000 * getStateTransferTimeout())); + isTimeout = ((reqNow - reqStart) > (1000L * getStateTransferTimeout())); } while ((!getStateTransfered()) && (!isTimeout) && (!isNoContextManagerReceived())); } else { if(getStateTransferTimeout() == -1) { @@ -1031,7 +1031,7 @@ public class DeltaManager extends Cluste if (!expires && (msg == null)) { long replDelta = System.currentTimeMillis() - session.getLastTimeReplicated(); if (session.getMaxInactiveInterval() >=0 && - replDelta > (session.getMaxInactiveInterval() * 1000)) { + replDelta > (session.getMaxInactiveInterval() * 1000L)) { counterSend_EVT_SESSION_ACCESSED++; msg = new SessionMessageImpl(getName(), SessionMessage.EVT_SESSION_ACCESSED, Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1631730&r1=1631729&r2=1631730&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Oct 14 12:18:09 2014 @@ -158,6 +158,9 @@ Add support for the <code>SessionIdGenerator</code> to cluster manager template. (kfujino) </fix> + <fix> + Avoid possible integer overflows reported by Coverity Scan. (fschumacher) + </fix> </changelog> </subsection> <subsection name="WebSocket"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org