Author: fschumacher
Date: Tue Oct 14 14:28:03 2014
New Revision: 1631771
URL: http://svn.apache.org/r1631771
Log:
Merged revision 1631730 from tomcat/trunk:
Avoid possible integer overflows reported by Coverity Scan
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1631730
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1631771&r1=1631770&r2=1631771&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Tue Oct 14 14:28:03 2014
@@ -847,7 +847,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) {
@@ -1025,7 +1025,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/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1631771&r1=1631770&r2=1631771&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Oct 14 14:28:03 2014
@@ -69,6 +69,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Cluster">
+ <changelog>
+ <fix>
+ Avoid possible integer overflows reported by Coverity Scan.
(fschumacher)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="WebSocket">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
