Ok, this is back to code discipline. At some point, we'd have to expect that more users will adopt v7 in production (I'm still seeing 80%+ being on v6), at that point, commits like this do nothing except pollute the diffs.
Servlet 3.1 has released a draft, where I'd expect that trunk is headed. There is no reason for v7 to continue to be an exact mirror of trunk, especially from a formatting point of view. While this makes the code prettier, it makes it a lot harder to trace regressions. I'd suggest we start treating this as a stable branch, stable in my perception is that it's a branch that I use to support production environments, and that I can use to trace regressions and fixes. Let me give an example, in my job, I primarily work in support. In the last two weeks we've had some serious production regressions on v7, and tracing it down was a lot harder than it usually is as the v7 branch still is fairly volatile in development, even though we're already at 7.0.27. A commit that doesn't change functionality but changes formatting, adds more lines to each diff I review when I trace back changes. I would assume that the tomcat dev community in some shape or form must feel the same sense of "supporting" our users when we look through the user community's bug reports, and trace down the bugs. For that reason, I'd like us to be more conscious about our commits on v7 and start looking at v7 as bug fixes and stabilization as the primary drivers for commits. Beautification of code in v7 doesn't make fixing it later easier, it makes it harder. And beautification's primary goal is simpler to read, use and maintain. But it only works if the original code was that way. If we want to make code formatting a 'requirement', let's discuss that, and adjust the build scripts accordingly. Now it's a manual process. I'd suggest that formatting requirements would be started on a new thread, and started with trunk. Best Filip > -----Original Message----- > From: kkoli...@apache.org [mailto:kkoli...@apache.org] > Sent: Monday, June 04, 2012 1:28 AM > To: dev@tomcat.apache.org > Subject: svn commit: r1345848 - in /tomcat/tc7.0.x/trunk: ./ > java/org/apache/catalina/deploy/NamingResources.java > java/org/apache/tomcat/util/net/AbstractEndpoint.java > > Author: kkolinko > Date: Mon Jun 4 07:27:46 2012 > New Revision: 1345848 > > URL: http://svn.apache.org/viewvc?rev=1345848&view=rev > Log: > Merged revision 1345846 from tomcat/trunk: > Code formatting (indents). No functional change. > > Modified: > tomcat/tc7.0.x/trunk/ (props changed) > > tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.jav > a > > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.ja > va > > Propchange: tomcat/tc7.0.x/trunk/ > ------------------------------------------------------------------------ > ------ > Merged /tomcat/trunk:r1345846 > > Modified: > tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.jav > a > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catali > na/deploy/NamingResources.java?rev=1345848&r1=1345847&r2=1345848&view=di > ff > ======================================================================== > ====== > --- > tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.jav > a (original) > +++ > tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.jav > a Mon Jun 4 07:27:46 2012 > @@ -400,7 +400,8 @@ public class NamingResources extends Lif > throw new IllegalArgumentException(sm.getString( > "namingResources.resourceTypeFail", > resource.getName(), > resource.getType())); > - } entries.add(resource.getName()); > + } > + entries.add(resource.getName()); > } > > synchronized (resourceEnvRefs) { > > Modified: > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.ja > va > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat > /util/net/AbstractEndpoint.java?rev=1345848&r1=1345847&r2=1345848&view=d > iff > ======================================================================== > ====== > --- > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.ja > va (original) > +++ > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.ja > va Mon Jun 4 07:27:46 2012 > @@ -163,10 +163,11 @@ public abstract class AbstractEndpoint { > LimitLatch latch = this.connectionLimitLatch; > if (latch != null) { > // Update the latch that enforces this > - if (maxCon == -1) > + if (maxCon == -1) { > releaseConnectionLatch(); > - else > - latch.setLimit(maxCon); > + } else { > + latch.setLimit(maxCon); > + } > } else if (maxCon > 0) { > initializeConnectionLatch(); > } > > > > --------------------------------------------------------------------- > 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
