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 db47aa4 Skip untranslated values on import new 26c4c04 Replace indexed for loops and iterator while with foreach new 041ae23 Additional clean-up after enhanced for loop changes 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/el/BeanELResolver.java | 6 +- java/javax/el/Util.java | 12 +- java/javax/servlet/ServletSecurityElement.java | 12 +- .../servlet/jsp/el/ImplicitObjectELResolver.java | 26 ++- .../javax/servlet/jsp/tagext/SimpleTagSupport.java | 3 +- .../javax/servlet/jsp/tagext/TagAttributeInfo.java | 10 +- java/javax/servlet/jsp/tagext/TagData.java | 4 +- java/javax/servlet/jsp/tagext/TagLibraryInfo.java | 18 +- .../catalina/ant/jmx/JMXAccessorQueryTask.java | 6 +- .../catalina/authenticator/AuthenticatorBase.java | 6 +- .../catalina/authenticator/BasicAuthenticator.java | 6 +- .../catalina/authenticator/FormAuthenticator.java | 4 +- .../catalina/authenticator/SingleSignOn.java | 6 +- .../apache/catalina/connector/CoyoteAdapter.java | 8 +- java/org/apache/catalina/connector/Request.java | 14 +- .../catalina/core/ApplicationFilterFactory.java | 24 +-- .../catalina/core/ApplicationHttpRequest.java | 4 +- .../apache/catalina/core/ApplicationRequest.java | 4 +- java/org/apache/catalina/core/ContainerBase.java | 14 +- java/org/apache/catalina/core/StandardContext.java | 137 +++++++------- java/org/apache/catalina/core/StandardHost.java | 4 +- java/org/apache/catalina/core/StandardServer.java | 22 +-- .../catalina/filters/CsrfPreventionFilterBase.java | 6 +- .../apache/catalina/filters/RemoteIpFilter.java | 4 +- .../catalina/filters/RequestDumperFilter.java | 6 +- .../catalina/ha/context/ReplicatedContext.java | 20 +- .../apache/catalina/ha/deploy/FarmWarDeployer.java | 10 +- java/org/apache/catalina/ha/deploy/WarWatcher.java | 8 +- .../apache/catalina/ha/session/DeltaManager.java | 14 +- .../apache/catalina/ha/session/DeltaRequest.java | 45 +++-- .../apache/catalina/ha/session/DeltaSession.java | 10 +- .../apache/catalina/ha/tcp/ReplicationValve.java | 8 +- .../catalina/loader/WebappClassLoaderBase.java | 17 +- java/org/apache/catalina/loader/WebappLoader.java | 32 ++-- .../catalina/manager/HTMLManagerServlet.java | 5 +- .../apache/catalina/manager/ManagerServlet.java | 18 +- .../manager/host/HTMLHostManagerServlet.java | 33 ++-- .../catalina/manager/host/HostManagerServlet.java | 4 +- .../apache/catalina/manager/util/SessionUtils.java | 16 +- java/org/apache/catalina/mapper/Mapper.java | 4 +- .../org/apache/catalina/mbeans/ContainerMBean.java | 8 +- java/org/apache/catalina/mbeans/MBeanFactory.java | 27 +-- java/org/apache/catalina/mbeans/MBeanUtils.java | 6 +- .../catalina/mbeans/NamingResourcesMBean.java | 25 +-- .../apache/catalina/realm/GenericPrincipal.java | 4 +- .../apache/catalina/realm/JAASCallbackHandler.java | 46 +++-- .../catalina/realm/JAASMemoryLoginModule.java | 4 +- java/org/apache/catalina/realm/JAASRealm.java | 12 +- java/org/apache/catalina/realm/JNDIRealm.java | 6 +- java/org/apache/catalina/realm/RealmBase.java | 107 ++++++----- java/org/apache/catalina/session/FileStore.java | 4 +- java/org/apache/catalina/session/ManagerBase.java | 4 +- .../catalina/session/PersistentManagerBase.java | 36 ++-- .../apache/catalina/session/StandardManager.java | 3 +- .../apache/catalina/session/StandardSession.java | 93 ++++------ java/org/apache/catalina/session/StoreBase.java | 16 +- .../catalina/ssi/SSIServletExternalResolver.java | 3 +- java/org/apache/catalina/startup/Catalina.java | 16 +- .../catalina/startup/ClassLoaderFactory.java | 40 ++-- .../org/apache/catalina/startup/ContextConfig.java | 29 ++- java/org/apache/catalina/startup/ExpandWar.java | 4 +- .../apache/catalina/startup/HomesUserDatabase.java | 6 +- java/org/apache/catalina/startup/HostConfig.java | 70 +++---- .../catalina/startup/SetAllPropertiesRule.java | 2 +- .../catalina/storeconfig/StandardContextSF.java | 15 +- .../catalina/storeconfig/StandardEngineSF.java | 6 +- .../catalina/storeconfig/StandardHostSF.java | 6 +- .../apache/catalina/storeconfig/StoreAppender.java | 14 +- .../catalina/storeconfig/StoreFactoryBase.java | 4 +- .../apache/catalina/tribes/ChannelException.java | 3 +- .../apache/catalina/tribes/group/GroupChannel.java | 11 +- .../interceptors/FragmentationInterceptor.java | 18 +- .../group/interceptors/NonBlockingCoordinator.java | 12 +- .../group/interceptors/OrderInterceptor.java | 10 +- .../group/interceptors/TcpFailureDetector.java | 20 +- .../interceptors/TwoPhaseCommitInterceptor.java | 11 +- .../catalina/tribes/io/ReplicationStream.java | 6 +- .../tribes/membership/McastServiceImpl.java | 15 +- .../catalina/tribes/membership/Membership.java | 10 +- .../tribes/tipis/AbstractReplicatedMap.java | 42 ++--- .../catalina/tribes/transport/PooledSender.java | 12 +- .../tribes/transport/nio/NioReplicationTask.java | 38 ++-- .../tribes/transport/nio/ParallelNioSender.java | 42 ++--- .../tribes/transport/nio/PooledParallelSender.java | 4 +- java/org/apache/catalina/tribes/util/Arrays.java | 17 +- java/org/apache/catalina/util/DOMWriter.java | 3 +- .../apache/catalina/util/ExtensionValidator.java | 13 +- java/org/apache/catalina/util/URLEncoder.java | 3 +- .../catalina/valves/AbstractAccessLogValve.java | 14 +- java/org/apache/catalina/valves/RemoteIpValve.java | 4 +- .../catalina/valves/rewrite/RewriteRule.java | 8 +- .../catalina/valves/rewrite/RewriteValve.java | 18 +- .../catalina/valves/rewrite/Substitution.java | 4 +- java/org/apache/coyote/CompressionConfig.java | 4 +- java/org/apache/coyote/ajp/AjpProcessor.java | 6 +- .../apache/el/parser/AstCompositeExpression.java | 4 +- .../org/apache/el/parser/ELParserTokenManager.java | 16 +- java/org/apache/el/parser/SimpleCharStream.java | 8 +- java/org/apache/el/parser/SimpleNode.java | 4 +- java/org/apache/el/util/ReflectionUtil.java | 12 +- java/org/apache/jasper/JspC.java | 19 +- java/org/apache/jasper/compiler/Collector.java | 4 +- .../jasper/compiler/DefaultErrorHandler.java | 22 +-- .../apache/jasper/compiler/ELFunctionMapper.java | 3 +- java/org/apache/jasper/compiler/Generator.java | 203 ++++++++++----------- java/org/apache/jasper/compiler/JDTCompiler.java | 17 +- .../apache/jasper/compiler/JspRuntimeContext.java | 22 +-- java/org/apache/jasper/compiler/JspUtil.java | 27 ++- java/org/apache/jasper/compiler/Node.java | 6 +- java/org/apache/jasper/compiler/Parser.java | 8 +- .../apache/jasper/compiler/ParserController.java | 3 +- .../apache/jasper/compiler/ScriptingVariabler.java | 24 +-- java/org/apache/jasper/compiler/SmapUtil.java | 20 +- java/org/apache/jasper/compiler/Validator.java | 42 ++--- .../jasper/runtime/JspApplicationContextImpl.java | 4 +- .../apache/jasper/runtime/JspContextWrapper.java | 3 +- .../apache/jasper/runtime/JspRuntimeLibrary.java | 43 ++--- java/org/apache/jasper/runtime/JspWriterImpl.java | 3 +- .../apache/jasper/servlet/JspCServletContext.java | 8 +- .../jasper/tagplugins/jstl/core/ForEach.java | 9 +- .../apache/jasper/tagplugins/jstl/core/When.java | 3 +- java/org/apache/juli/ClassLoaderLogManager.java | 8 +- .../org/apache/naming/factory/SendMailFactory.java | 3 +- java/org/apache/tomcat/buildutil/SignCode.java | 12 +- java/org/apache/tomcat/buildutil/Txt2Html.java | 26 ++- .../tomcat/dbcp/dbcp2/DelegatingConnection.java | 5 +- .../datasources/InstanceKeyDataSourceFactory.java | 9 +- java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 5 +- .../dbcp/pool2/impl/GenericKeyedObjectPool.java | 21 +-- .../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 9 +- .../dbcp/pool2/impl/SoftReferenceObjectPool.java | 9 +- java/org/apache/tomcat/util/Diagnostics.java | 4 +- .../org/apache/tomcat/util/IntrospectionUtils.java | 70 +++---- java/org/apache/tomcat/util/buf/ByteChunk.java | 5 +- java/org/apache/tomcat/util/buf/HexUtils.java | 8 +- java/org/apache/tomcat/util/buf/UriUtil.java | 3 +- .../apache/tomcat/util/codec/binary/Base64.java | 4 +- .../tomcat/util/descriptor/web/FilterMap.java | 8 +- .../util/descriptor/web/SecurityCollection.java | 12 +- .../util/descriptor/web/SecurityConstraint.java | 20 +- .../tomcat/util/descriptor/web/WebRuleSet.java | 7 +- java/org/apache/tomcat/util/digester/Digester.java | 14 +- java/org/apache/tomcat/util/file/Matcher.java | 4 +- .../tomcat/util/http/Rfc6265CookieProcessor.java | 3 +- .../org/apache/tomcat/util/http/parser/Cookie.java | 4 +- .../apache/tomcat/util/modeler/BaseModelMBean.java | 10 +- .../util/modeler/BaseNotificationBroadcaster.java | 3 +- java/org/apache/tomcat/util/modeler/Registry.java | 20 +- .../MbeansDescriptorsIntrospectionSource.java | 56 +++--- .../apache/tomcat/util/net/jsse/JSSESupport.java | 8 +- .../tomcat/util/net/openssl/OpenSSLConf.java | 8 +- .../tomcat/websocket/AuthenticatorFactory.java | 5 +- .../tomcat/websocket/WsWebSocketContainer.java | 4 +- .../apache/tomcat/jdbc/test/TestValidation.java | 9 +- .../authenticator/TestFormAuthenticator.java | 15 +- .../TestNonLoginAndBasicAuthenticator.java | 9 +- .../TestSSOnonLoginAndBasicAuthenticator.java | 18 +- .../TestSSOnonLoginAndDigestAuthenticator.java | 6 +- .../catalina/connector/TestMaxConnections.java | 8 +- .../catalina/connector/TestOutputBuffer.java | 4 +- .../org/apache/catalina/connector/TestRequest.java | 7 +- .../apache/catalina/core/TestAsyncContextImpl.java | 3 +- .../apache/catalina/startup/SimpleHttpClient.java | 6 +- .../catalina/tribes/demos/ChannelCreator.java | 12 +- .../catalina/tribes/demos/CoordinationDemo.java | 6 +- .../apache/catalina/tribes/demos/EchoRpcTest.java | 4 +- .../catalina/tribes/demos/IntrospectionUtils.java | 51 +++--- .../org/apache/catalina/tribes/demos/LoadTest.java | 6 +- test/org/apache/catalina/tribes/demos/MapDemo.java | 4 +- .../group/TestGroupChannelMemberArrival.java | 12 +- .../group/TestGroupChannelSenderConnections.java | 8 +- .../interceptors/TestDomainFilterInterceptor.java | 8 +- .../group/interceptors/TestOrderInterceptor.java | 16 +- .../tribes/test/channel/TestDataIntegrity.java | 58 +++--- .../tribes/test/channel/TestMulticastPackages.java | 8 +- .../tribes/test/channel/TestUdpPackages.java | 16 +- test/org/apache/catalina/valves/Benchmarks.java | 4 +- .../apache/coyote/http11/TestHttp11Processor.java | 4 +- .../apache/jasper/compiler/TesterValidator.java | 22 +-- .../org/apache/juli/TestClassLoaderLogManager.java | 4 +- .../tomcat/util/http/parser/TestMediaType.java | 6 +- webapps/docs/changelog.xml | 4 + .../examples/WEB-INF/classes/CookieExample.java | 7 +- .../WEB-INF/classes/async/AsyncStockServlet.java | 9 +- .../CompressionFilterTestServlet.java | 3 +- .../CompressionResponseStream.java | 4 +- .../examples/WEB-INF/classes/util/HTMLFilter.java | 32 ++-- .../WEB-INF/classes/websocket/drawboard/Room.java | 4 +- webapps/examples/WEB-INF/jsp/applet/Clock2.java | 3 +- webapps/examples/jsp/checkbox/checkresult.jsp | 16 +- webapps/examples/jsp/plugin/applet/Clock2.java | 3 +- webapps/examples/jsp/sessions/carts.jsp | 4 +- 192 files changed, 1404 insertions(+), 1517 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org