tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@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
Date Mon, 04 Jun 2012 07:27:47 GMT
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.java
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1345846

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java?rev=1345848&r1=1345847&r2=1345848&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java 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.java
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=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message