On 22/11/2015 17:53, Felix Schumacher wrote: > Hi all, > > do I have to add a changelog entry for such a trivial change?
Up to you. I'd lean towards yes rather than no. With trivial stuff like this I try and do a bunch of them at once and then lump them together under a single changelog entry. Mark > > Regards, > Felix > > Am 22.11.2015 um 18:31 schrieb fschumac...@apache.org: >> Author: fschumacher >> Date: Sun Nov 22 17:31:30 2015 >> New Revision: 1715661 >> >> URL: http://svn.apache.org/viewvc?rev=1715661&view=rev >> Log: >> Fix potential integer overflow. Reported by coverity scan. >> >> Modified: >> tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java >> >> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java >> >> >> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java >> >> >> Modified: >> tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1715661&r1=1715660&r2=1715661&view=diff >> >> ============================================================================== >> >> --- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java >> (original) >> +++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java >> Sun Nov 22 17:31:30 2015 >> @@ -221,7 +221,7 @@ public class DeltaSession extends Standa >> @Override >> public boolean isAccessReplicate() { >> long replDelta = System.currentTimeMillis() - >> getLastTimeReplicated(); >> - if (maxInactiveInterval >=0 && replDelta > >> (maxInactiveInterval * 1000)) { >> + if (maxInactiveInterval >=0 && replDelta > >> (maxInactiveInterval * 1000L)) { >> return true; >> } >> return false; >> >> Modified: >> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java >> >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1715661&r1=1715660&r2=1715661&view=diff >> >> ============================================================================== >> >> --- >> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java >> (original) >> +++ >> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java >> Sun Nov 22 17:31:30 2015 >> @@ -954,7 +954,7 @@ public class ConnectionPool { >> busy.remove(con); >> abandon(con); >> setToNull = true; >> - } else if (sto > 0 && (now - time) > (sto*1000)) { >> + } else if (sto > 0 && (now - time) > (sto * >> 1000L)) { >> suspect(con); >> } else { >> //do nothing >> >> Modified: >> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java >> >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1715661&r1=1715660&r2=1715661&view=diff >> >> ============================================================================== >> >> --- >> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java >> (original) >> +++ >> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java >> Sun Nov 22 17:31:30 2015 >> @@ -400,7 +400,7 @@ public class PooledConnection { >> if (poolProperties.getRemoveAbandonedTimeout() <= 0) { >> return Long.MAX_VALUE; >> } else { >> - return poolProperties.getRemoveAbandonedTimeout()*1000; >> + return poolProperties.getRemoveAbandonedTimeout() * 1000L; >> } //end if >> } >> >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
