This is an automated email from the ASF dual-hosted git repository.
schultz 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 fc5ddda Made some variable names more consistent with the other parts.
new 386da63 Merge pull request #217 from euske/master
fc5ddda is described below
commit fc5dddae560209200d02b59926a7f109dc1199df
Author: Yusuke Shinyama <yus...@shinyama.jp>
AuthorDate: Mon Oct 21 17:35:02 2019 +0900
Made some variable names more consistent with the other parts.
---
java/javax/servlet/GenericServlet.java | 6 +++---
.../org/apache/catalina/filters/AddDefaultCharsetFilter.java | 12 ++++++------
java/org/apache/jasper/JspCompilationContext.java | 7 +++----
java/org/apache/jasper/compiler/Generator.java | 4 ++--
java/org/apache/tomcat/util/buf/CharChunk.java | 4 ++--
.../apache/tomcat/util/security/ConcurrentMessageDigest.java | 6 +++---
6 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/java/javax/servlet/GenericServlet.java
b/java/javax/servlet/GenericServlet.java
index f040cb7..da70a61 100644
--- a/java/javax/servlet/GenericServlet.java
+++ b/java/javax/servlet/GenericServlet.java
@@ -180,12 +180,12 @@ public abstract class GenericServlet implements Servlet,
ServletConfig,
* Writes the specified message to a servlet log file, prepended by the
* servlet's name. See {@link ServletContext#log(String)}.
*
- * @param msg
+ * @param message
* a <code>String</code> specifying the message to be written to
* the log file
*/
- public void log(String msg) {
- getServletContext().log(getServletName() + ": " + msg);
+ public void log(String message) {
+ getServletContext().log(getServletName() + ": " + message);
}
/**
diff --git a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
index b146764..98adb4f 100644
--- a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
+++ b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
@@ -106,17 +106,17 @@ public class AddDefaultCharsetFilter extends FilterBase {
}
@Override
- public void setContentType(String ct) {
+ public void setContentType(String contentType) {
- if (ct != null && ct.startsWith("text/")) {
- if (!ct.contains("charset=")) {
- super.setContentType(ct + ";charset=" + encoding);
+ if (contentType != null && contentType.startsWith("text/")) {
+ if (!contentType.contains("charset=")) {
+ super.setContentType(contentType + ";charset=" + encoding);
} else {
- super.setContentType(ct);
+ super.setContentType(contentType);
encoding = getCharacterEncoding();
}
} else {
- super.setContentType(ct);
+ super.setContentType(contentType);
}
}
diff --git a/java/org/apache/jasper/JspCompilationContext.java
b/java/org/apache/jasper/JspCompilationContext.java
index 9f602be..bdf669b 100644
--- a/java/org/apache/jasper/JspCompilationContext.java
+++ b/java/org/apache/jasper/JspCompilationContext.java
@@ -454,11 +454,11 @@ public class JspCompilationContext {
if (isTagFile()) {
String className = tagInfo.getTagClassName();
int lastIndex = className.lastIndexOf('.');
- String pkgName = "";
+ String packageName = "";
if (lastIndex != -1) {
- pkgName = className.substring(0, lastIndex);
+ packageName = className.substring(0, lastIndex);
}
- return pkgName;
+ return packageName;
} else {
String dPackageName = getDerivedPackageName();
if (dPackageName.length() == 0) {
@@ -767,4 +767,3 @@ public class JspCompilationContext {
return result.toString();
}
}
-
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 72a40ff..c5678ec 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3695,8 +3695,8 @@ class Generator {
String className = tagInfo.getTagClassName();
int lastIndex = className.lastIndexOf('.');
if (lastIndex != -1) {
- String pkgName = className.substring(0, lastIndex);
- genPreamblePackage(pkgName);
+ String packageName = className.substring(0, lastIndex);
+ genPreamblePackage(packageName);
className = className.substring(lastIndex + 1);
}
diff --git a/java/org/apache/tomcat/util/buf/CharChunk.java
b/java/org/apache/tomcat/util/buf/CharChunk.java
index 75b1ede..70818df 100644
--- a/java/org/apache/tomcat/util/buf/CharChunk.java
+++ b/java/org/apache/tomcat/util/buf/CharChunk.java
@@ -165,7 +165,7 @@ public final class CharChunk extends AbstractChunk
implements CharSequence {
// -------------------- Adding data to the buffer --------------------
- public void append(char b) throws IOException {
+ public void append(char c) throws IOException {
makeSpace(1);
int limit = getLimitInternal();
@@ -173,7 +173,7 @@ public final class CharChunk extends AbstractChunk
implements CharSequence {
if (end >= limit) {
flushBuffer();
}
- buff[end++] = b;
+ buff[end++] = c;
}
diff --git a/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java
b/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java
index 647493a..c2d385d 100644
--- a/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java
+++ b/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java
@@ -68,7 +68,7 @@ public class ConcurrentMessageDigest {
}
- public static byte[] digest(String algorithm, int rounds, byte[]... input)
{
+ public static byte[] digest(String algorithm, int iterations, byte[]...
input) {
Queue<MessageDigest> queue = queues.get(algorithm);
if (queue == null) {
@@ -93,8 +93,8 @@ public class ConcurrentMessageDigest {
byte[] result = md.digest();
// Subsequent rounds
- if (rounds > 1) {
- for (int i = 1; i < rounds; i++) {
+ if (iterations > 1) {
+ for (int i = 1; i < iterations; i++) {
md.update(result);
result = md.digest();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
