You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/01/13 13:11:07 UTC
[tomcat] branch 9.0.x updated (58807b2729 -> a2e9924b09)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 58807b2729 Checkstyle checks for Javadoc += NonEmptyAtclauseDescription
new d166ba6cd4 Checkstyle checks for Javadoc += SingleLineJavadoc
new 5c313fdde8 Align with 10.0.x
new a2e9924b09 Fix Checkstyle warnings
The 3 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:
.../apache/catalina/ha/session/DeltaSession.java | 6 +-
java/org/apache/catalina/loader/WebappLoader.java | 6 +-
.../catalina/manager/StatusManagerServlet.java | 28 +++------
.../apache/catalina/manager/StatusTransformer.java | 69 +++++++---------------
.../apache/catalina/mbeans/LocalStrings.properties | 1 -
.../catalina/mbeans/LocalStrings_es.properties | 16 -----
.../apache/catalina/realm/GenericPrincipal.java | 2 +-
.../catalina/startup/ClassLoaderFactory.java | 2 +-
.../org/apache/catalina/startup/ContextConfig.java | 3 +-
.../apache/catalina/startup/HomesUserDatabase.java | 32 +---------
.../apache/catalina/startup/WebAnnotationSet.java | 1 +
java/org/apache/catalina/tribes/io/BufferPool.java | 2 -
.../catalina/tribes/membership/MemberImpl.java | 2 +-
.../catalina/tribes/util/TcclThreadFactory.java | 1 -
.../apache/catalina/valves/PersistentValve.java | 1 -
.../dbcp/dbcp2/DelegatingCallableStatement.java | 4 +-
.../dbcp/dbcp2/DelegatingPreparedStatement.java | 4 +-
.../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 16 +++--
res/checkstyle/checkstyle.xml | 4 ++
.../filters/TesterHttpServletResponse.java | 12 +++-
20 files changed, 72 insertions(+), 140 deletions(-)
delete mode 100644 java/org/apache/catalina/mbeans/LocalStrings_es.properties
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: Checkstyle checks for Javadoc += SingleLineJavadoc
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d166ba6cd4120a05e08b5493bbab85025e5dcd7f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 13 10:37:21 2023 +0000
Checkstyle checks for Javadoc += SingleLineJavadoc
---
.../tomcat/dbcp/dbcp2/DelegatingCallableStatement.java | 4 +++-
.../tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java | 4 +++-
.../apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java | 16 ++++++++++++----
res/checkstyle/checkstyle.xml | 4 ++++
4 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
index d8fce5b93c..1f365e2292 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
@@ -97,7 +97,9 @@ public class DelegatingCallableStatement extends DelegatingPreparedStatement imp
}
}
- /** @deprecated Use {@link #getBigDecimal(int)} or {@link #getBigDecimal(String)} */
+ /**
+ * @deprecated Use {@link #getBigDecimal(int)} or {@link #getBigDecimal(String)}
+ */
@Override
@Deprecated
public BigDecimal getBigDecimal(final int parameterIndex, final int scale) throws SQLException {
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
index 4ecf26f891..0dd7668a95 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
@@ -660,7 +660,9 @@ public class DelegatingPreparedStatement extends DelegatingStatement implements
}
}
- /** @deprecated Use setAsciiStream(), setCharacterStream() or setNCharacterStream() */
+ /**
+ * @deprecated Use setAsciiStream(), setCharacterStream() or setNCharacterStream()
+ */
@Deprecated
@Override
public void setUnicodeStream(final int parameterIndex, final InputStream x, final int length) throws SQLException {
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
index 62b1a3b612..227d806833 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
@@ -277,7 +277,9 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
}
}
- /** @deprecated Use {@link #getBigDecimal(int)} */
+ /**
+ * @deprecated Use {@link #getBigDecimal(int)}
+ */
@Deprecated
@Override
public BigDecimal getBigDecimal(final int columnIndex, final int scale) throws SQLException {
@@ -299,7 +301,9 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
}
}
- /** @deprecated Use {@link #getBigDecimal(String)} */
+ /**
+ * @deprecated Use {@link #getBigDecimal(String)}
+ */
@Deprecated
@Override
public BigDecimal getBigDecimal(final String columnName, final int scale) throws SQLException {
@@ -990,7 +994,9 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
}
}
- /** @deprecated Use {@link #getCharacterStream(int)} */
+ /**
+ * @deprecated Use {@link #getCharacterStream(int)}
+ */
@Deprecated
@Override
public InputStream getUnicodeStream(final int columnIndex) throws SQLException {
@@ -1002,7 +1008,9 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
}
}
- /** @deprecated Use {@link #getCharacterStream(String)} */
+ /**
+ * @deprecated Use {@link #getCharacterStream(String)}
+ */
@Deprecated
@Override
public InputStream getUnicodeStream(final String columnName) throws SQLException {
diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index 7cdfaab2dc..e029f8d9bf 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -101,6 +101,10 @@
<module name="MissingJavadocType"/>
-->
<module name="NonEmptyAtclauseDescription"/>
+ <!-- ~1600 errors
+ <module name="RequireEmptyLineBeforeBlockTagGroup"/>
+ -->
+ <module name="SingleLineJavadoc"/>
<!-- Miscellaneous -->
<!-- ~5500 errors
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Fix Checkstyle warnings
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a2e9924b099b443ff45f8481edda3d43ae5832cb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 13 13:11:00 2023 +0000
Fix Checkstyle warnings
---
.../apache/catalina/filters/TesterHttpServletResponse.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/test/org/apache/catalina/filters/TesterHttpServletResponse.java b/test/org/apache/catalina/filters/TesterHttpServletResponse.java
index 4f9c4f9d91..4a8f07cf26 100644
--- a/test/org/apache/catalina/filters/TesterHttpServletResponse.java
+++ b/test/org/apache/catalina/filters/TesterHttpServletResponse.java
@@ -217,13 +217,17 @@ public class TesterHttpServletResponse implements HttpServletResponse {
public boolean containsHeader(String name) { return false; }
@Override
public String encodeRedirectURL(String url) { return null; }
- /** @deprecated Do not use */
+ /**
+ * @deprecated Do not use
+ */
@Override
@Deprecated
public String encodeRedirectUrl(String url) { return null; }
@Override
public String encodeURL(String url) { return null; }
- /** @deprecated Do not use */
+ /**
+ * @deprecated Do not use
+ */
@Override
@Deprecated
public String encodeUrl(String url) { return null; }
@@ -243,7 +247,9 @@ public class TesterHttpServletResponse implements HttpServletResponse {
public void setDateHeader(String name, long value) {/* NOOP */}
@Override
public void setIntHeader(String name, int value) {/* NOOP */}
- /** @deprecated Do not use */
+ /**
+ * @deprecated Do not use
+ */
@Override
@Deprecated
public void setStatus(int status, String message) {/* NOOP */}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: Align with 10.0.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5c313fdde8041cf91b999a7ce8ccdce65bd80782
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 13 13:09:48 2023 +0000
Align with 10.0.x
---
.../apache/catalina/ha/session/DeltaSession.java | 6 +-
java/org/apache/catalina/loader/WebappLoader.java | 6 +-
.../catalina/manager/StatusManagerServlet.java | 28 +++------
.../apache/catalina/manager/StatusTransformer.java | 69 +++++++---------------
.../apache/catalina/mbeans/LocalStrings.properties | 1 -
.../catalina/mbeans/LocalStrings_es.properties | 16 -----
.../apache/catalina/realm/GenericPrincipal.java | 2 +-
.../catalina/startup/ClassLoaderFactory.java | 2 +-
.../org/apache/catalina/startup/ContextConfig.java | 3 +-
.../apache/catalina/startup/HomesUserDatabase.java | 32 +---------
.../apache/catalina/startup/WebAnnotationSet.java | 1 +
java/org/apache/catalina/tribes/io/BufferPool.java | 2 -
.../catalina/tribes/membership/MemberImpl.java | 2 +-
.../catalina/tribes/util/TcclThreadFactory.java | 1 -
.../apache/catalina/valves/PersistentValve.java | 1 -
15 files changed, 41 insertions(+), 131 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java b/java/org/apache/catalina/ha/session/DeltaSession.java
index e4371321e9..85ef168028 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -1110,11 +1110,11 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
}
protected void setAccessCount(int count) {
- if ( accessCount == null && ACTIVITY_CHECK ) {
+ if (accessCount == null && ACTIVITY_CHECK) {
accessCount = new AtomicInteger();
}
- if ( accessCount != null ) {
- super.accessCount.set(count);
+ if (accessCount != null) {
+ accessCount.set(count);
}
}
}
diff --git a/java/org/apache/catalina/loader/WebappLoader.java b/java/org/apache/catalina/loader/WebappLoader.java
index 3ac2daed20..98b81657ae 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -138,8 +138,7 @@ public class WebappLoader extends LifecycleMBeanBase
/**
* The string manager for this package.
*/
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(WebappLoader.class);
/**
@@ -179,8 +178,7 @@ public class WebappLoader extends LifecycleMBeanBase
}
if (getState().isAvailable()) {
- throw new IllegalStateException(
- sm.getString("webappLoader.setContext.ise"));
+ throw new IllegalStateException(sm.getString("webappLoader.setContext.ise"));
}
// Deregister from the old Context (if any)
diff --git a/java/org/apache/catalina/manager/StatusManagerServlet.java b/java/org/apache/catalina/manager/StatusManagerServlet.java
index 9ea16b4720..b6d026e4de 100644
--- a/java/org/apache/catalina/manager/StatusManagerServlet.java
+++ b/java/org/apache/catalina/manager/StatusManagerServlet.java
@@ -16,12 +16,10 @@
*/
package org.apache.catalina.manager;
-
import java.io.IOException;
import java.io.PrintWriter;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.Enumeration;
import java.util.Iterator;
import java.util.Set;
import java.util.Vector;
@@ -46,8 +44,7 @@ import org.apache.tomcat.util.res.StringManager;
*
* @author Remy Maucherat
*/
-public class StatusManagerServlet
- extends HttpServlet implements NotificationListener {
+public class StatusManagerServlet extends HttpServlet implements NotificationListener {
private static final long serialVersionUID = 1L;
@@ -88,13 +85,11 @@ public class StatusManagerServlet
/**
* The string manager for this package.
*/
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);
// --------------------------------------------------------- Public Methods
-
/**
* Initialize this servlet.
*/
@@ -311,9 +306,7 @@ public class StatusManagerServlet
// use StatusTransformer to output status
StatusTransformer.writeVMState(writer,mode, args);
- Enumeration<ObjectName> enumeration = threadPools.elements();
- while (enumeration.hasMoreElements()) {
- ObjectName objectName = enumeration.nextElement();
+ for (ObjectName objectName : threadPools) {
String name = objectName.getKeyProperty("name");
args = new Object[19];
args[0] = smClient.getString("htmlManagerServlet.connectorStateMaxThreads");
@@ -336,18 +329,14 @@ public class StatusManagerServlet
args[17] = smClient.getString("htmlManagerServlet.connectorStateTableTitleRequest");
args[18] = smClient.getString("htmlManagerServlet.connectorStateHint");
// use StatusTransformer to output status
- StatusTransformer.writeConnectorState
- (writer, objectName,
- name, mBeanServer, globalRequestProcessors,
- requestProcessors, mode, args);
+ StatusTransformer.writeConnectorState(writer, objectName, name, mBeanServer, globalRequestProcessors,
+ requestProcessors, mode, args);
}
- if ((request.getPathInfo() != null)
- && (request.getPathInfo().equals("/all"))) {
+ if ((request.getPathInfo() != null) && (request.getPathInfo().equals("/all"))) {
// Note: Retrieving the full status is much slower
// use StatusTransformer to output status
- StatusTransformer.writeDetailedState
- (writer, mBeanServer, mode);
+ StatusTransformer.writeDetailedState(writer, mBeanServer, mode);
}
} catch (Exception e) {
@@ -356,11 +345,10 @@ public class StatusManagerServlet
// use StatusTransformer to output status
StatusTransformer.writeFooter(writer, mode);
-
}
- // ------------------------------------------- NotificationListener Methods
+ // ------------------------------------------- NotificationListener Methods
@Override
public void handleNotification(Notification notification,
diff --git a/java/org/apache/catalina/manager/StatusTransformer.java b/java/org/apache/catalina/manager/StatusTransformer.java
index 41c2b12892..5fc4ac866b 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -23,7 +23,6 @@ import java.lang.management.MemoryUsage;
import java.lang.reflect.Method;
import java.text.MessageFormat;
import java.util.Date;
-import java.util.Enumeration;
import java.util.Iterator;
import java.util.Set;
import java.util.SortedMap;
@@ -47,12 +46,9 @@ import org.apache.tomcat.util.security.Escape;
*/
public class StatusTransformer {
-
// --------------------------------------------------------- Public Methods
-
- public static void setContentType(HttpServletResponse response,
- int mode) {
+ public static void setContentType(HttpServletResponse response, int mode) {
if (mode == 0){
response.setContentType("text/html;charset="+Constants.CHARSET);
} else if (mode == 1){
@@ -67,15 +63,12 @@ public class StatusTransformer {
* @param writer the PrintWriter to use
* @param args Path prefix for URLs
* @param mode - 0 = HTML header, 1 = XML declaration
- *
*/
public static void writeHeader(PrintWriter writer, Object[] args, int mode) {
- if (mode == 0){
+ if (mode == 0) {
// HTML Header Section
- writer.print(MessageFormat.format(
- Constants.HTML_HEADER_SECTION, args
- ));
- } else if (mode == 1){
+ writer.print(MessageFormat.format(Constants.HTML_HEADER_SECTION, args));
+ } else if (mode == 1) {
writer.write(Constants.XML_DECLARATION);
writer.print(MessageFormat.format
(Constants.XML_STYLE, args));
@@ -94,8 +87,7 @@ public class StatusTransformer {
*/
public static void writeBody(PrintWriter writer, Object[] args, int mode) {
if (mode == 0){
- writer.print(MessageFormat.format
- (Constants.BODY_HEADER_SECTION, args));
+ writer.print(MessageFormat.format(Constants.BODY_HEADER_SECTION, args));
}
}
@@ -107,26 +99,22 @@ public class StatusTransformer {
* @param args What to write
* @param mode 0 means write
*/
- public static void writeManager(PrintWriter writer, Object[] args,
- int mode) {
- if (mode == 0){
+ public static void writeManager(PrintWriter writer, Object[] args, int mode) {
+ if (mode == 0) {
writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args));
}
}
- public static void writePageHeading(PrintWriter writer, Object[] args,
- int mode) {
- if (mode == 0){
- writer.print(MessageFormat.format
- (Constants.SERVER_HEADER_SECTION, args));
+ public static void writePageHeading(PrintWriter writer, Object[] args, int mode) {
+ if (mode == 0) {
+ writer.print(MessageFormat.format(Constants.SERVER_HEADER_SECTION, args));
}
}
- public static void writeServerInfo(PrintWriter writer, Object[] args,
- int mode){
- if (mode == 0){
+ public static void writeServerInfo(PrintWriter writer, Object[] args, int mode){
+ if (mode == 0) {
writer.print(MessageFormat.format(Constants.SERVER_ROW_SECTION, args));
}
}
@@ -337,10 +325,8 @@ public class StatusTransformer {
ObjectName grpName = null;
- Enumeration<ObjectName> enumeration = globalRequestProcessors.elements();
- // Find the HTTP/1.1 RequestGroupInfo - BZ 65404
- while (enumeration.hasMoreElements()) {
- ObjectName objectName = enumeration.nextElement();
+ for (ObjectName objectName : globalRequestProcessors) {
+ // Find the HTTP/1.1 RequestGroupInfo - BZ 65404
if (name.equals(objectName.getKeyProperty("name")) && objectName.getKeyProperty("Upgrade") == null) {
grpName = objectName;
}
@@ -352,13 +338,11 @@ public class StatusTransformer {
writer.print( args[4] );
writer.print(' ');
- writer.print(formatTime(mBeanServer.getAttribute
- (grpName, "maxTime"), false));
+ writer.print(formatTime(mBeanServer.getAttribute(grpName, "maxTime"), false));
writer.print(' ');
writer.print(args[5]);
writer.print(' ');
- writer.print(formatTime(mBeanServer.getAttribute
- (grpName, "processingTime"), true));
+ writer.print(formatTime(mBeanServer.getAttribute(grpName, "processingTime"), true));
writer.print(' ');
writer.print(args[6]);
writer.print(' ');
@@ -370,20 +354,16 @@ public class StatusTransformer {
writer.print(' ');
writer.print(args[8]);
writer.print(' ');
- writer.print(formatSize(mBeanServer.getAttribute
- (grpName, "bytesReceived"), true));
+ writer.print(formatSize(mBeanServer.getAttribute(grpName, "bytesReceived"), true));
writer.print(' ');
writer.print(args[9]);
writer.print(' ');
- writer.print(formatSize(mBeanServer.getAttribute
- (grpName, "bytesSent"), true));
+ writer.print(formatSize(mBeanServer.getAttribute(grpName, "bytesSent"), true));
writer.print("</p>");
writer.print("<table border=\"0\"><tr><th>"+ args[10] + "</th><th>" + args[11] + "</th><th>" + args[12] +"</th><th>" + args[13] +"</th><th>" + args[14] + "</th><th>" + args[15] + "</th><th>" + args[16] + "</th><th>" + args[17] + "</th></tr>");
- enumeration = requestProcessors.elements();
- while (enumeration.hasMoreElements()) {
- ObjectName objectName = enumeration.nextElement();
+ for (ObjectName objectName : requestProcessors) {
if (name.equals(objectName.getKeyProperty("worker"))) {
writer.print("<tr>");
writeProcessorState(writer, objectName, mBeanServer, mode);
@@ -407,10 +387,8 @@ public class StatusTransformer {
ObjectName grpName = null;
- Enumeration<ObjectName> enumeration = globalRequestProcessors.elements();
- // Find the HTTP/1.1 RequestGroupInfo - BZ 65404
- while (enumeration.hasMoreElements()) {
- ObjectName objectName = enumeration.nextElement();
+ for (ObjectName objectName : globalRequestProcessors) {
+ // Find the HTTP/1.1 RequestGroupInfo - BZ 65404
if (name.equals(objectName.getKeyProperty("name")) && objectName.getKeyProperty("Upgrade") == null) {
grpName = objectName;
}
@@ -428,9 +406,7 @@ public class StatusTransformer {
writer.write(" />");
writer.write("<workers>");
- enumeration = requestProcessors.elements();
- while (enumeration.hasMoreElements()) {
- ObjectName objectName = enumeration.nextElement();
+ for (ObjectName objectName : requestProcessors) {
if (name.equals(objectName.getKeyProperty("worker"))) {
writeProcessorState(writer, objectName, mBeanServer, mode);
}
@@ -440,7 +416,6 @@ public class StatusTransformer {
writer.write("</connector>");
}
-
}
diff --git a/java/org/apache/catalina/mbeans/LocalStrings.properties b/java/org/apache/catalina/mbeans/LocalStrings.properties
index 09a79f53eb..70a62b95fe 100644
--- a/java/org/apache/catalina/mbeans/LocalStrings.properties
+++ b/java/org/apache/catalina/mbeans/LocalStrings.properties
@@ -21,7 +21,6 @@ globalResources.createError.userDatabase.group=Cannot create Group MBean for gro
globalResources.createError.userDatabase.role=Cannot create Role MBean for role [{0}]
globalResources.createError.userDatabase.user=Cannot create User MBean for user [{0}]
globalResources.noNamingContext=No global naming context defined for server
-globalResources.notServer=This listener must only be nested within Server elements, but is in [{0}].
globalResources.userDatabaseCreateError=Exception creating UserDatabase MBeans for [{0}]
listener.notServer=This listener must only be nested within Server elements, but is in [{0}].
diff --git a/java/org/apache/catalina/mbeans/LocalStrings_es.properties b/java/org/apache/catalina/mbeans/LocalStrings_es.properties
deleted file mode 100644
index b09f90411e..0000000000
--- a/java/org/apache/catalina/mbeans/LocalStrings_es.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-jmxRemoteLifecycleListener.invalidURL=LA URL del servicio JMX solicitada por el servidor [{0}], [{1}], fue no válida
diff --git a/java/org/apache/catalina/realm/GenericPrincipal.java b/java/org/apache/catalina/realm/GenericPrincipal.java
index 52a039b27a..bf765273cb 100644
--- a/java/org/apache/catalina/realm/GenericPrincipal.java
+++ b/java/org/apache/catalina/realm/GenericPrincipal.java
@@ -153,7 +153,7 @@ public class GenericPrincipal implements TomcatPrincipal, Serializable {
/**
* The set of roles associated with this user.
*/
- protected final String roles[];
+ protected final String[] roles;
public String[] getRoles() {
return this.roles;
diff --git a/java/org/apache/catalina/startup/ClassLoaderFactory.java b/java/org/apache/catalina/startup/ClassLoaderFactory.java
index 0fc76f3fcd..394e8a0606 100644
--- a/java/org/apache/catalina/startup/ClassLoaderFactory.java
+++ b/java/org/apache/catalina/startup/ClassLoaderFactory.java
@@ -92,7 +92,7 @@ public final class ClassLoaderFactory {
if (!file.canRead()) {
continue;
}
- file = new File(file.getCanonicalPath() + File.separator);
+ file = new File(file.getCanonicalPath());
URL url = file.toURI().toURL();
if (log.isDebugEnabled()) {
log.debug(" Including directory " + url);
diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index 9025adabe3..a61095f7f5 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1568,8 +1568,7 @@ public class ContextConfig implements LifecycleListener {
context.setSessionTimeout(
sessionConfig.getSessionTimeout().intValue());
}
- SessionCookieConfig scc =
- context.getServletContext().getSessionCookieConfig();
+ SessionCookieConfig scc = context.getServletContext().getSessionCookieConfig();
scc.setName(sessionConfig.getCookieName());
scc.setDomain(sessionConfig.getCookieDomain());
scc.setPath(sessionConfig.getCookiePath());
diff --git a/java/org/apache/catalina/startup/HomesUserDatabase.java b/java/org/apache/catalina/startup/HomesUserDatabase.java
index 1a77c16fa8..a0be2dbc5f 100644
--- a/java/org/apache/catalina/startup/HomesUserDatabase.java
+++ b/java/org/apache/catalina/startup/HomesUserDatabase.java
@@ -16,14 +16,12 @@
*/
package org.apache.catalina.startup;
-
import java.io.File;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
-
/**
* Concrete implementation of the <code>UserDatabase</code> interface
* considers all directories in a directory whose pathname is specified
@@ -31,41 +29,19 @@ import java.util.Map;
*
* @author Craig R. McClanahan
*/
-public final class HomesUserDatabase
- implements UserDatabase {
-
-
- // --------------------------------------------------------- Constructors
-
-
- /**
- * Initialize a new instance of this user database component.
- */
- public HomesUserDatabase() {
-
- super();
-
- }
-
-
- // --------------------------------------------------- Instance Variables
-
+public final class HomesUserDatabase implements UserDatabase {
/**
* The set of home directories for all defined users, keyed by username.
*/
private final Map<String,String> homes = new HashMap<>();
-
/**
* The UserConfig listener with which we are associated.
*/
private UserConfig userConfig = null;
- // ----------------------------------------------------------- Properties
-
-
/**
* Return the UserConfig listener with which we are associated.
*/
@@ -87,9 +63,6 @@ public final class HomesUserDatabase
}
- // ------------------------------------------------------- Public Methods
-
-
/**
* Return an absolute pathname to the home directory for the specified user.
*
@@ -110,9 +83,6 @@ public final class HomesUserDatabase
}
- // ------------------------------------------------------ Private Methods
-
-
/**
* Initialize our set of users and home directories.
*/
diff --git a/java/org/apache/catalina/startup/WebAnnotationSet.java b/java/org/apache/catalina/startup/WebAnnotationSet.java
index f1636aff3a..62bf6c32a0 100644
--- a/java/org/apache/catalina/startup/WebAnnotationSet.java
+++ b/java/org/apache/catalina/startup/WebAnnotationSet.java
@@ -251,6 +251,7 @@ public class WebAnnotationSet {
}
}
*/
+
/* Process DeclareRoles annotation.
* Ref JSR 250, equivalent to the security-role element in
* the deployment descriptor
diff --git a/java/org/apache/catalina/tribes/io/BufferPool.java b/java/org/apache/catalina/tribes/io/BufferPool.java
index cb6dce5672..719b1e65ac 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool.java
@@ -28,8 +28,6 @@ public class BufferPool {
protected static final StringManager sm = StringManager.getManager(BufferPool.class);
-
-
protected static volatile BufferPool instance = null;
protected final BufferPoolAPI pool;
diff --git a/java/org/apache/catalina/tribes/membership/MemberImpl.java b/java/org/apache/catalina/tribes/membership/MemberImpl.java
index e2ae9239da..88cc38e88d 100644
--- a/java/org/apache/catalina/tribes/membership/MemberImpl.java
+++ b/java/org/apache/catalina/tribes/membership/MemberImpl.java
@@ -455,7 +455,7 @@ public class MemberImpl implements Member, java.io.Externalizable {
}
public String getHostname() {
- if ( this.hostname != null ) {
+ if (this.hostname != null) {
return hostname;
} else {
try {
diff --git a/java/org/apache/catalina/tribes/util/TcclThreadFactory.java b/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
index de46faa62b..052d3ea51c 100644
--- a/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
+++ b/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
@@ -66,5 +66,4 @@ public class TcclThreadFactory implements ThreadFactory {
t.setDaemon(true);
return t;
}
-
}
diff --git a/java/org/apache/catalina/valves/PersistentValve.java b/java/org/apache/catalina/valves/PersistentValve.java
index 5976f021cc..14c84e1bc1 100644
--- a/java/org/apache/catalina/valves/PersistentValve.java
+++ b/java/org/apache/catalina/valves/PersistentValve.java
@@ -180,7 +180,6 @@ public class PersistentValve extends ValveBase {
session.recycle();
stored = true;
}
-
}
}
if (!stored) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org