On 04/12/2020 00:05, ebo...@apache.org wrote: <snip/>
> commit d03a176f94b42564ac5f6f28b587ad0e483716e2 > Author: Emmanuel Bourg <ebo...@apache.org> > AuthorDate: Fri Dec 4 00:15:59 2020 +0100 > > Collapse identical catch blocks <snip/> > java/org/apache/el/parser/AstValue.java | 6 ++---- This is generated code. The change will be undone the next time the source is regenerated. My preference is to leave generated code as-is but I don't think this needs to be reverted. > .../dbcp/dbcp2/PoolableCallableStatement.java | 4 +--- > .../dbcp2/datasources/InstanceKeyDataSource.java | 10 ++------- This code is forked from Commons DBCP2. Any changes increases the risk of future merges having conflicts that require manual resolution. Better to apply the clean-up upstream and then pick it up in the next merge. Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org