This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 329cd98 Polish. Clean-up spacing, Javadoc and comments
329cd98 is described below
commit 329cd983d764b4160a2cb197003dff21efea67d0
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Sep 9 10:29:10 2019 +0100
Polish. Clean-up spacing, Javadoc and comments
---
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 2 +-
java/org/apache/catalina/realm/GenericPrincipal.java | 2 +-
java/org/apache/catalina/realm/JNDIRealm.java | 3 ---
java/org/apache/coyote/AbstractProcessor.java | 1 +
java/org/apache/tomcat/util/digester/Digester.java | 3 +--
5 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 7418744..a62d5d8 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -327,7 +327,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 <code>null</null> and in
+ * implementations this class loader is always <code>null</code> 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 c249c36..6a848de 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 <code>false</code>
*/
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 5707cbf..ee71d0a 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;
@@ -2902,8 +2901,6 @@ public class JNDIRealm extends RealmBase {
public String getUserRoleId() {
return userRoleId;
}
-
-
}
}
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index 1affefa..03984f9 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -90,6 +90,7 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
userDataHelper = new UserDataHelper(getLog());
}
+
/**
* Update the current error state to the new error state if the new error
* state is more severe than the current error state.
diff --git a/java/org/apache/tomcat/util/digester/Digester.java
b/java/org/apache/tomcat/util/digester/Digester.java
index 3b0f35e..e3ed881 100644
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -240,6 +240,7 @@ public class Digester extends DefaultHandler2 {
*/
protected ArrayStack<Object> params = new ArrayStack<>();
+
/**
* The SAXParser we will use to parse the input stream.
*/
@@ -1949,6 +1950,4 @@ public class Digester extends DefaultHandler2 {
return new StringBuilder(out);
}
}
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
