This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 95e81e8 Code clean-up. Add braces to improve readability. new a959aca Code clean-up. Add braces for clarity. Enable check now all are fixed. new 69bf01a Code clean-up. Fix remaining braces. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/javax/servlet/http/HttpServlet.java | 72 +- .../catalina/core/ApplicationHttpRequest.java | 2 + java/org/apache/catalina/core/ContainerBase.java | 9 +- java/org/apache/catalina/core/StandardContext.java | 18 +- java/org/apache/catalina/core/StandardService.java | 3 +- .../core/ThreadLocalLeakPreventionListener.java | 6 +- .../apache/catalina/ha/session/DeltaSession.java | 8 +- .../apache/catalina/manager/StatusTransformer.java | 6 +- .../mbeans/JmxRemoteLifecycleListener.java | 15 +- .../catalina/realm/JAASMemoryLoginModule.java | 3 +- java/org/apache/catalina/realm/JDBCRealm.java | 30 +- java/org/apache/catalina/session/JDBCStore.java | 30 +- .../catalina/startup/SetAllPropertiesRule.java | 6 +- .../storeconfig/ConnectorStoreAppender.java | 3 +- .../storeconfig/GlobalNamingResourcesSF.java | 9 +- .../catalina/storeconfig/NamingResourcesSF.java | 3 +- .../apache/catalina/storeconfig/StoreConfig.java | 21 +- .../storeconfig/StoreConfigLifecycleListener.java | 5 +- .../apache/catalina/storeconfig/StoreLoader.java | 18 +- .../apache/catalina/storeconfig/StoreRegistry.java | 25 +- .../catalina/storeconfig/WatchedResourceSF.java | 3 +- .../catalina/storeconfig/WrapperLifecycleSF.java | 3 +- .../catalina/storeconfig/WrapperListenerSF.java | 3 +- .../catalina/tribes/io/BufferPool15Impl.java | 11 +- .../catalina/tribes/membership/McastService.java | 18 +- .../catalina/tribes/membership/MemberImpl.java | 10 +- .../catalina/tribes/transport/bio/BioReceiver.java | 34 +- .../tribes/transport/bio/BioReplicationTask.java | 24 +- .../catalina/tribes/transport/bio/BioSender.java | 55 +- .../tribes/transport/bio/MultipointBioSender.java | 35 +- .../tribes/transport/bio/PooledMultiSender.java | 7 +- .../catalina/tribes/util/ExecutorFactory.java | 4 +- .../catalina/valves/rewrite/RewriteValve.java | 6 +- java/org/apache/coyote/RequestInfo.java | 3 +- .../apache/coyote/http11/Http11InputBuffer.java | 8 +- .../http11/filters/SavedRequestInputFilter.java | 3 +- java/org/apache/el/lang/ELSupport.java | 3 +- java/org/apache/el/parser/ELParser.java | 1002 +++++++++++---- .../org/apache/el/parser/ELParserTokenManager.java | 1283 ++++++++++++-------- java/org/apache/el/parser/ParseException.java | 4 +- java/org/apache/el/parser/SimpleCharStream.java | 46 +- java/org/apache/jasper/compiler/SmapGenerator.java | 6 +- java/org/apache/jasper/el/JspValueExpression.java | 36 +- .../apache/jasper/runtime/JspContextWrapper.java | 3 +- .../apache/jasper/runtime/JspRuntimeLibrary.java | 5 +- java/org/apache/jasper/security/SecurityUtil.java | 3 +- java/org/apache/jasper/xmlparser/UCSReader.java | 46 +- java/org/apache/jasper/xmlparser/UTF8Reader.java | 6 +- .../jasper/xmlparser/XMLEncodingDetector.java | 8 +- .../apache/jasper/xmlparser/XMLStringBuffer.java | 6 +- .../util/descriptor/web/SecurityConstraint.java | 9 +- .../util/modeler/BaseNotificationBroadcaster.java | 3 +- .../tomcat/util/net/NioBlockingSelector.java | 72 +- java/org/apache/tomcat/util/net/NioChannel.java | 4 +- java/org/apache/tomcat/util/net/NioEndpoint.java | 42 +- .../apache/tomcat/util/net/NioSelectorPool.java | 15 +- .../apache/tomcat/util/net/SecureNioChannel.java | 31 +- .../tomcat/util/scan/StandardJarScanner.java | 6 +- .../apache/tomcat/jdbc/pool/ConnectionPool.java | 158 ++- .../org/apache/tomcat/jdbc/pool/DataSource.java | 8 +- .../apache/tomcat/jdbc/pool/DataSourceProxy.java | 26 +- .../apache/tomcat/jdbc/pool/FairBlockingQueue.java | 15 +- .../apache/tomcat/jdbc/pool/JdbcInterceptor.java | 7 +- .../jdbc/pool/MultiLockFairBlockingQueue.java | 23 +- .../apache/tomcat/jdbc/pool/PoolProperties.java | 58 +- .../apache/tomcat/jdbc/pool/PooledConnection.java | 106 +- .../apache/tomcat/jdbc/pool/ProxyConnection.java | 9 +- .../apache/tomcat/jdbc/pool/StatementFacade.java | 12 +- .../org/apache/tomcat/jdbc/pool/TrapException.java | 4 +- .../jdbc/pool/interceptor/AbstractQueryReport.java | 16 +- .../jdbc/pool/interceptor/ConnectionState.java | 12 +- .../pool/interceptor/QueryTimeoutInterceptor.java | 4 +- .../jdbc/pool/interceptor/SlowQueryReport.java | 33 +- .../jdbc/pool/interceptor/SlowQueryReportJmx.java | 12 +- .../jdbc/pool/interceptor/StatementCache.java | 66 +- .../interceptor/StatementDecoratorInterceptor.java | 15 +- .../jdbc/pool/interceptor/StatementFinalizer.java | 5 +- .../tomcat/jdbc/pool/jmx/ConnectionPool.java | 36 +- .../org/apache/tomcat/jdbc/pool/jmx/JmxUtil.java | 16 +- .../tomcat/jdbc/test/CheckOutThreadTest.java | 4 +- .../apache/tomcat/jdbc/test/ConnectCountTest.java | 17 +- .../apache/tomcat/jdbc/test/CreateTestTable.java | 5 +- .../org/apache/tomcat/jdbc/test/FairnessTest.java | 17 +- .../apache/tomcat/jdbc/test/PoolCleanerTest.java | 4 +- .../apache/tomcat/jdbc/test/StarvationTest.java | 8 +- res/checkstyle/checkstyle.xml | 2 - .../TestJaspicCallbackHandlerInAuthenticator.java | 5 +- .../catalina/connector/TestKeepAliveCount.java | 4 +- .../org/apache/catalina/connector/TestRequest.java | 52 +- .../apache/catalina/core/TestAsyncContextImpl.java | 5 +- .../apache/catalina/core/TestStandardContext.java | 4 +- .../catalina/nonblocking/TestNonBlockingAPI.java | 23 +- .../realm/TestMessageDigestCredentialHandler.java | 5 +- .../apache/catalina/startup/TomcatBaseTest.java | 7 +- .../catalina/tribes/demos/ChannelCreator.java | 12 +- .../catalina/tribes/demos/CoordinationDemo.java | 88 +- .../apache/catalina/tribes/demos/EchoRpcTest.java | 10 +- .../catalina/tribes/demos/IntrospectionUtils.java | 45 +- .../org/apache/catalina/tribes/demos/LoadTest.java | 40 +- test/org/apache/catalina/tribes/demos/MapDemo.java | 18 +- .../tribes/demos/MembersWithProperties.java | 4 +- .../tribes/group/TestGroupChannelOptionFlag.java | 8 +- .../interceptors/TestDomainFilterInterceptor.java | 8 +- .../group/interceptors/TestEncryptInterceptor.java | 25 +- .../group/interceptors/TestOrderInterceptor.java | 15 +- .../tribes/test/channel/TestDataIntegrity.java | 36 +- .../tribes/test/channel/TestMulticastPackages.java | 36 +- .../test/channel/TestRemoteProcessException.java | 10 +- .../tribes/test/channel/TestUdpPackages.java | 40 +- .../test/transport/SocketValidateReceive.java | 8 +- .../valves/TestLoadBalancerDrainingValve.java | 5 +- test/org/apache/jasper/compiler/Dumper.java | 5 +- .../apache/jasper/compiler/TesterValidator.java | 5 +- test/org/apache/tomcat/util/net/TesterSupport.java | 14 +- .../WEB-INF/classes/filters/ExampleFilter.java | 3 +- 115 files changed, 2983 insertions(+), 1413 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org