[tomcat] branch 8.5.x updated: Polish. Align with 9.0.x/7.0.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 5479b5b Polish. Align with 9.0.x/7.0.x
5479b5b is described below
commit 5479b5bb922459cd1c4fc59b19ca0b0bc0f0edf2
Author: Mark Thomas
AuthorDate: Tue Nov 12 12:13:22 2019 +
Polish. Align with 9.0.x/7.0.x
---
java/org/apache/catalina/ContainerEvent.java | 5 ++---
java/org/apache/catalina/Context.java| 6 +-
java/org/apache/catalina/UserDatabase.java | 32 +++-
3 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/java/org/apache/catalina/ContainerEvent.java
b/java/org/apache/catalina/ContainerEvent.java
index 31be8a8..b651356 100644
--- a/java/org/apache/catalina/ContainerEvent.java
+++ b/java/org/apache/catalina/ContainerEvent.java
@@ -16,7 +16,6 @@
*/
package org.apache.catalina;
-
import java.util.EventObject;
/**
@@ -91,7 +90,7 @@ public final class ContainerEvent extends EventObject {
*/
@Override
public String toString() {
-return ("ContainerEvent['" + getContainer() + "','" +
-getType() + "','" + getData() + "']");
+return "ContainerEvent['" + getContainer() + "','" +
+getType() + "','" + getData() + "']";
}
}
diff --git a/java/org/apache/catalina/Context.java
b/java/org/apache/catalina/Context.java
index 8471fa4..329fd2e 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -1415,6 +1415,7 @@ public interface Context extends Container, ContextBind {
*/
public JspConfigDescriptor getJspConfigDescriptor();
+
/**
* Set the JspConfigDescriptor for this context.
* A null value indicates there is not JSP configuration.
@@ -1423,6 +1424,7 @@ public interface Context extends Container, ContextBind {
*/
public void setJspConfigDescriptor(JspConfigDescriptor descriptor);
+
/**
* Add a ServletContainerInitializer instance to this web application.
*
@@ -1433,6 +1435,7 @@ public interface Context extends Container, ContextBind {
public void addServletContainerInitializer(
ServletContainerInitializer sci, Set> classes);
+
/**
* Is this Context paused whilst it is reloaded?
*
@@ -1448,6 +1451,7 @@ public interface Context extends Container, ContextBind {
*/
boolean isServlet22();
+
/**
* Notification that Servlet security has been dynamically set in a
* {@link javax.servlet.ServletRegistration.Dynamic}
@@ -1503,7 +1507,7 @@ public interface Context extends Container, ContextBind {
/**
* @return The version of this web application, used to differentiate
* different versions of the same web application when using parallel
- * deployment.
+ * deployment. If not specified, defaults to the empty string.
*/
public String getWebappVersion();
diff --git a/java/org/apache/catalina/UserDatabase.java
b/java/org/apache/catalina/UserDatabase.java
index 9a1a932..a76cfeb 100644
--- a/java/org/apache/catalina/UserDatabase.java
+++ b/java/org/apache/catalina/UserDatabase.java
@@ -14,29 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina;
-
import java.util.Iterator;
-
/**
- * Abstract representation of a database of {@link User}s and
- * {@link Group}s that can be maintained by an application,
- * along with definitions of corresponding {@link Role}s, and
- * referenced by a {@link Realm} for authentication and access control.
+ * Abstract representation of a database of {@link User}s and {@link Group}s
+ * that can be maintained by an application, along with definitions of
+ * corresponding {@link Role}s, and referenced by a {@link Realm} for
+ * authentication and access control.
*
* @author Craig R. McClanahan
* @since 4.1
*/
public interface UserDatabase {
-
// - Properties
-
/**
* @return the set of {@link Group}s defined in this user database.
*/
@@ -63,7 +57,6 @@ public interface UserDatabase {
// - Public Methods
-
/**
* Finalize access to this user database.
*
@@ -100,13 +93,12 @@ public interface UserDatabase {
* @param fullName The full name of the new user
* @return The new user
*/
-public User createUser(String username, String password,
- String fullName);
+public User createUser(String username, String password, String fullName);
/**
* @return the {@link Group} with the specified group name, if any;
- * otherwise return null.
+ * otherwise return null.
*
[tomcat] branch 8.5.x updated: Polish. Align with 9.0.x.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 4bce6f1 Polish. Align with 9.0.x.
4bce6f1 is described below
commit 4bce6f1af32bc352af8abe521d78163bd741fb59
Author: Mark Thomas
AuthorDate: Mon Sep 9 10:30:06 2019 +0100
Polish. Align with 9.0.x.
Spacing, Javadoc, comments.
---
.../catalina/loader/WebappClassLoaderBase.java | 2 +-
.../apache/catalina/realm/GenericPrincipal.java| 2 +-
java/org/apache/catalina/realm/JNDIRealm.java | 3 --
.../org/apache/catalina/security/SecurityUtil.java | 1 -
.../apache/catalina/tribes/group/GroupChannel.java | 1 +
.../apache/catalina/util/LifecycleMBeanBase.java | 2 -
java/org/apache/coyote/AbstractProcessor.java | 1 +
java/org/apache/coyote/Request.java| 4 +-
java/org/apache/jasper/compiler/AntCompiler.java | 1 -
java/org/apache/juli/FileHandler.java | 14 +++
java/org/apache/tomcat/util/digester/Digester.java | 8 +---
.../apache/tomcat/util/net/SecureNioChannel.java | 49 +++---
12 files changed, 48 insertions(+), 40 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 4287325..ee79208 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -325,7 +325,7 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
/**
* The bootstrap class loader used to load the JavaSE classes. In some
- * implementations this class loader is always null and in
+ * implementations this class loader is always null and in
* those cases {@link ClassLoader#getParent()} will be called recursively
on
* the system class loader and the last non-null result used.
*/
diff --git a/java/org/apache/catalina/realm/GenericPrincipal.java
b/java/org/apache/catalina/realm/GenericPrincipal.java
index 64c0d30..caaf352 100644
--- a/java/org/apache/catalina/realm/GenericPrincipal.java
+++ b/java/org/apache/catalina/realm/GenericPrincipal.java
@@ -201,7 +201,7 @@ public class GenericPrincipal implements TomcatPrincipal,
Serializable {
* role, otherwise false
*/
public boolean hasRole(String role) {
-if ("*".equals(role)) {// Special 2.4 role meaning everyone
+if ("*".equals(role)) { // Special 2.4 role meaning everyone
return true;
}
if (role == null) {
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index a69dd71..88ef9ce 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.catalina.realm;
import java.io.IOException;
@@ -2917,8 +2916,6 @@ public class JNDIRealm extends RealmBase {
public String getUserRoleId() {
return userRoleId;
}
-
-
}
}
diff --git a/java/org/apache/catalina/security/SecurityUtil.java
b/java/org/apache/catalina/security/SecurityUtil.java
index 4a550ea..5736ca5 100644
--- a/java/org/apache/catalina/security/SecurityUtil.java
+++ b/java/org/apache/catalina/security/SecurityUtil.java
@@ -93,7 +93,6 @@ public final class SecurityUtil{
* @param methodName the method to apply the security restriction
* @param targetObject the Servlet on which the method will
* be called.
- * @throws Exception an execution error occurred
*/
public static void doAsPrivilege(final String methodName,
final Servlet targetObject) throws
Exception {
diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java
b/java/org/apache/catalina/tribes/group/GroupChannel.java
index a8d5315..94759d5 100644
--- a/java/org/apache/catalina/tribes/group/GroupChannel.java
+++ b/java/org/apache/catalina/tribes/group/GroupChannel.java
@@ -71,6 +71,7 @@ public class GroupChannel extends ChannelInterceptorBase
* If set to true, the channel will start a local thread for the heart
beat.
*/
protected boolean heartbeat = true;
+
/**
* If heartbeat == true then how often do we want this
* heartbeat to run. default is one minute
diff --git a/java/org/apache/catalina/util/LifecycleMBeanBase.java
b/java/org/apache/catalina/util/LifecycleMBeanBase.java
index 417015d..9463291 100644
--- a/java/org/apache/catalina/util/LifecycleMBeanBase.java
+++ b/java/org/apache/catalina/util/LifecycleMBeanBase.java
@@ -52,7 +52,6 @@ public abstract class LifecycleMBeanBase extends LifecycleBase
*/
@Override
protected
[tomcat] branch 8.5.x updated: Polish. Align with 9.0.x.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 66286b4 Polish. Align with 9.0.x.
66286b4 is described below
commit 66286b4fbe47847f998cb080929da63f6799f58a
Author: Mark Thomas
AuthorDate: Sat Sep 7 23:04:00 2019 +0100
Polish. Align with 9.0.x.
---
java/org/apache/catalina/filters/AddDefaultCharsetFilter.java | 2 +-
java/org/apache/catalina/manager/host/HostManagerServlet.java | 4
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
index 29bcb68..b146764 100644
--- a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
+++ b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
@@ -109,7 +109,7 @@ public class AddDefaultCharsetFilter extends FilterBase {
public void setContentType(String ct) {
if (ct != null && ct.startsWith("text/")) {
-if (ct.indexOf("charset=") < 0) {
+if (!ct.contains("charset=")) {
super.setContentType(ct + ";charset=" + encoding);
} else {
super.setContentType(ct);
diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java
b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index 729717f..f88b931 100644
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -584,9 +584,7 @@ public class HostManagerServlet
"hostManagerServlet.startFailed", name));
writer.println(smClient.getString(
"hostManagerServlet.exception", e.toString()));
-return;
}
-
}
@@ -646,9 +644,7 @@ public class HostManagerServlet
name));
writer.println(smClient.getString("hostManagerServlet.exception",
e.toString()));
-return;
}
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
