This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 57425a5e3a Fix typos (#1021)
57425a5e3a is described below
commit 57425a5e3af9030ef9a583edd399c971410127bf
Author: Michael Ernst <[email protected]>
AuthorDate: Wed Sep 7 12:13:59 2022 -1000
Fix typos (#1021)
---
log4j-1.2-api/src/main/java/org/apache/log4j/Category.java | 4 ++--
.../src/main/java/org/apache/log4j/helpers/OptionConverter.java | 2 +-
.../src/main/java/org/apache/log4j/spi/AppenderAttachable.java | 2 +-
log4j-1.2-api/src/test/java/org/apache/log4j/xml/XLevel.java | 2 +-
log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java | 2 +-
.../org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java | 2 +-
log4j-cassandra/src/test/resources/cassandra.yaml | 4 ++--
.../java/org/apache/logging/log4j/core/async/perftest/Histogram.java | 2 +-
.../org/apache/logging/log4j/core/async/perftest/IdleStrategy.java | 2 +-
.../main/java/org/apache/logging/log4j/core/appender/AppenderSet.java | 2 +-
.../apache/logging/log4j/core/appender/routing/RoutingAppender.java | 2 +-
.../logging/log4j/core/async/BasicAsyncLoggerContextSelector.java | 2 +-
.../main/java/org/apache/logging/log4j/core/lookup/DateLookup.java | 2 +-
.../src/main/java/org/apache/logging/log4j/core/util/Loader.java | 4 ++--
.../src/main/java/org/apache/logging/log4j/core/util/Source.java | 2 +-
.../logging/log4j/core/appender/MemoryMappedFileAppenderTest.java | 2 +-
.../apache/logging/log4j/core/appender/ReconfigureAppenderTest.java | 2 +-
.../src/main/java/org/apache/logging/log4j/docker/DockerLookup.java | 2 +-
src/site/xdoc/manual/configuration.xml.vm | 2 +-
19 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
index 60e3086dc8..1f9931c9d4 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
@@ -426,7 +426,7 @@ public class Category implements AppenderAttachable {
}
/**
- * Gets the the {@link LoggerRepository} where this <code>Category</code>
instance is attached.
+ * Gets the {@link LoggerRepository} where this <code>Category</code>
instance is attached.
*
* @deprecated Please use {@link #getLoggerRepository()} instead.
* @since 1.1
@@ -449,7 +449,7 @@ public class Category implements AppenderAttachable {
}
/**
- * Gets the the {@link LoggerRepository} where this <code>Category</code>
is attached.
+ * Gets the {@link LoggerRepository} where this <code>Category</code> is
attached.
*
* @since 1.2
*/
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
index cde42c7091..9e108164b2 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
@@ -557,7 +557,7 @@ public class OptionConverter {
* </p>
*
* <p>
- * Case of <code>value</code> is insignificant for the level level, but is
+ * Case of <code>value</code> is insignificant for the level, but is
* significant for the class name part, if present.
* </p>
*
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/AppenderAttachable.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/AppenderAttachable.java
index bdc2aa9ec1..261c5bb84a 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/AppenderAttachable.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/AppenderAttachable.java
@@ -48,7 +48,7 @@ public interface AppenderAttachable {
/**
* Returns <code>true</code> if the specified appender is in list of
- * attached attached, <code>false</code> otherwise.
+ * attached, <code>false</code> otherwise.
* @param appender The Appender to check.
* @return true if the Appender is attached.
*
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/xml/XLevel.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/xml/XLevel.java
index b0503b76cc..d90438c070 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/xml/XLevel.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/xml/XLevel.java
@@ -20,7 +20,7 @@ package org.apache.log4j.xml;
import org.apache.log4j.Level;
/**
- * This class introduces a new level level called TRACE. TRACE has lower level
than DEBUG.
+ * This class introduces a new level called TRACE. TRACE has lower level than
DEBUG.
*/
public class XLevel extends Level {
private static final long serialVersionUID = 7288304330257085144L;
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
index c11b9c993d..fa2ce33b36 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
@@ -62,7 +62,7 @@ public final class Strings {
* {@code null}, empty, or all characters are {@link
Character#isWhitespace(char)}.
*
* @param s the String to check, may be {@code null}
- * @return {@code true} if the String is {@code null}, empty, or or all
characters are {@link Character#isWhitespace(char)}
+ * @return {@code true} if the String is {@code null}, empty, or all
characters are {@link Character#isWhitespace(char)}
*/
public static boolean isBlank(final String s) {
if (s == null || s.isEmpty()) {
diff --git
a/log4j-api/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java
b/log4j-api/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java
index 4c71babf70..5666fa321d 100644
---
a/log4j-api/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java
+++
b/log4j-api/src/test/java/org/apache/logging/log4j/util/Log4jCharsetsPropertiesTest.java
@@ -42,7 +42,7 @@ public class Log4jCharsetsPropertiesTest {
String value = resourceBundle.getString(key);
assertTrue(
Charset.isSupported(value),
- String.format("The Charset %s is is not available and is
mapped from %s", value, key));
+ String.format("The Charset %s is not available and is
mapped from %s", value, key));
}
}
}
diff --git a/log4j-cassandra/src/test/resources/cassandra.yaml
b/log4j-cassandra/src/test/resources/cassandra.yaml
index 356e43dc2d..aab593b3e4 100644
--- a/log4j-cassandra/src/test/resources/cassandra.yaml
+++ b/log4j-cassandra/src/test/resources/cassandra.yaml
@@ -380,7 +380,7 @@ memtable_allocation_type: heap_buffers
# to the number of cores.
#memtable_flush_writers: 8
-# A fixed memory pool size in MB for for SSTable index summaries. If left
+# A fixed memory pool size in MB for SSTable index summaries. If left
# empty, this will default to 5% of the heap size. If the memory usage of
# all index summaries exceeds this limit, SSTables with low read rates will
# shrink their index summaries in order to meet this limit. However, this
@@ -549,7 +549,7 @@ rpc_server_type: sync
# Uncomment to set socket buffer size for internode communication
# Note that when setting this, the buffer size is limited by net.core.wmem_max
-# and when not setting it it is defined by net.ipv4.tcp_wmem
+# and when not setting it is defined by net.ipv4.tcp_wmem
# See:
# /proc/sys/net/core/wmem_max
# /proc/sys/net/core/rmem_max
diff --git
a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
index 89cf29f5c8..417fb512c8 100644
---
a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
+++
b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
@@ -120,7 +120,7 @@ public final class Histogram
* Add an observation to the histogram and increment the counter for the
interval it matches.
*
* @param value for the observation to be added.
- * @return return true if in the range of intervals and successfully added
observation; otherwise false.
+ * @return true if in the range of intervals and successfully added
observation; otherwise false.
*/
public boolean addObservation(final long value)
{
diff --git
a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java
b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java
index 65b97df77d..f73e3313b8 100644
---
a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java
+++
b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java
@@ -21,7 +21,7 @@ package org.apache.logging.log4j.core.async.perftest;
*
* <h3>Note regarding potential for TTSP(Time To Safe Point) issues</h3>
*
- * If the caller spins in a 'counted' loop, and the implementation does not
include a a safepoint poll this may cause a TTSP
+ * If the caller spins in a 'counted' loop, and the implementation does not
include a safepoint poll this may cause a TTSP
* (Time To SafePoint) problem. If this is the case for your application you
can solve it by preventing the idle method from
* being inlined by using a Hotspot compiler command as a JVM argument e.g:
*
<code>-XX:CompileCommand=dontinline,org.apache.logging.log4j.core.async.perftest.NoOpIdleStrategy::idle</code>
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
index 533a60437c..b5461720d8 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
@@ -65,7 +65,7 @@ public class AppenderSet {
for (final Node childNode : children) {
final String key = childNode.getAttributes().get("name");
if (key == null) {
- LOGGER.error("The attribute 'name' is missing from from
the node {} in AppenderSet {}",
+ LOGGER.error("The attribute 'name' is missing from the
node {} in AppenderSet {}",
childNode, children);
} else {
map.put(key, childNode);
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
index 738bac9e6a..6cfb8c2846 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
@@ -422,7 +422,7 @@ public final class RoutingAppender extends AbstractAppender
{
* LOG4J2-2629: PurgePolicy implementations can invoke {@link
#deleteAppender(String)} after we have looked up
* an instance of a target appender but before events are appended, which
could result in events not being
* recorded to any appender.
- * This extension of {@link AppenderControl} allows to to mark usage of an
appender, allowing deferral of
+ * This extension of {@link AppenderControl} allows to mark usage of an
appender, allowing deferral of
* {@link Appender#stop()} until events have successfully been recorded.
* Alternative approaches considered:
* - More aggressive synchronization: Appenders may do expensive I/O that
shouldn't block routing.
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/BasicAsyncLoggerContextSelector.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/BasicAsyncLoggerContextSelector.java
index 90ce160365..32f7ea61a1 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/BasicAsyncLoggerContextSelector.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/BasicAsyncLoggerContextSelector.java
@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
/**
* Returns either this Thread's context or the default {@link
AsyncLoggerContext}.
* Single-application instances should prefer this implementation over the
{@link AsyncLoggerContextSelector}
- * due the the reduced overhead avoiding classloader lookups.
+ * due to the reduced overhead avoiding classloader lookups.
*/
public class BasicAsyncLoggerContextSelector implements ContextSelector {
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java
index 17a34f1d67..a5141ec528 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java
@@ -48,7 +48,7 @@ public class DateLookup implements StrLookup {
}
/**
- * Looks up the the current date or the date in the LogEvent.
+ * Looks up d the current date or the date in the LogEvent.
* @param event The LogEvent for which the date is returned. If null,
current date is returned.
* @param key the format to use. If null, the default DateFormat will be
used.
* @return The formatted date, never null.
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
index 4aaca77125..2642981f24 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
@@ -80,7 +80,7 @@ public final class Loader {
* class ({@code Loader}). Under JDK 1.1, only the class
* loader that loaded this class ({@code Loader}) is used.</li>
* <li>Try one last time with
- * {@code ClassLoader.getSystemResource(resource)}, that is is
+ * {@code ClassLoader.getSystemResource(resource)}, that is
* using the system class loader in JDK 1.2 and virtual machine's
* built-in class loader in JDK 1.1.</li>
* </ol>
@@ -142,7 +142,7 @@ public final class Loader {
* class ({@code Loader}). Under JDK 1.1, only the class
* loader that loaded this class ({@code Loader}) is used.</li>
* <li>Try one last time with
- * {@code ClassLoader.getSystemResource(resource)}, that is is
+ * {@code ClassLoader.getSystemResource(resource)}, that is
* using the system class loader in JDK 1.2 and virtual machine's
* built-in class loader in JDK 1.1.</li>
* </ol>
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java
index e612634a62..8d45900075 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java
@@ -145,7 +145,7 @@ public class Source {
* Constructs a new {@code Source} from the specified URL.
*
* @param url the URL where the input stream originated
- * @throws IllegalArgumentException if this URL is not formatted strictly
according to to RFC2396 and cannot be
+ * @throws IllegalArgumentException if this URL is not formatted strictly
according to RFC2396 and cannot be
* converted to a URI.
*/
public Source(final URL url) {
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderTest.java
index 9dcf88e353..c5934b6fce 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderTest.java
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
- * Tests that logged strings appear in the file, that the initial file size is
the specified specified region length,
+ * Tests that logged strings appear in the file, that the initial file size is
the specified region length,
* that the file is extended by region length when necessary, and that the
file is shrunk to its actual usage when done.
*
* @since 2.1
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ReconfigureAppenderTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ReconfigureAppenderTest.java
index 8f8e06e9ae..8d3f776412 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ReconfigureAppenderTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ReconfigureAppenderTest.java
@@ -46,7 +46,7 @@ public class ReconfigureAppenderTest {
this.createAndAddAppender();
// let's write something to the logger to ensure the output
stream is opened.
- // We expect this call to create a a new output stream (which
is does).
+ // We expect this call to create a new output stream (which is
does).
// see OutputStreamManager.writeToDestination(...).
Logger logger = (Logger)LogManager.getLogger(this.getClass());
logger.info("test message 1");
diff --git
a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java
b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java
index a9cc1e2e7d..a546a84a08 100644
---
a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java
+++
b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java
@@ -35,7 +35,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
/**
- * Lookups up keys for for a Docker container.
+ * Lookups up keys for a Docker container.
*/
@Plugin(name = "docker", category = StrLookup.CATEGORY)
public class DockerLookup extends AbstractLookup {
diff --git a/src/site/xdoc/manual/configuration.xml.vm
b/src/site/xdoc/manual/configuration.xml.vm
index ebca22d1c8..d616103781 100644
--- a/src/site/xdoc/manual/configuration.xml.vm
+++ b/src/site/xdoc/manual/configuration.xml.vm
@@ -649,7 +649,7 @@ public class Bar {
The concise format makes configuration very easy as the element
names match the components they represent
however it cannot be validated with an XML schema. For example,
the ConsoleAppender is configured by
declaring an XML element named Console under its parent appenders
element. However, element
- and attribute names are are not case sensitive. In addition,
attributes can either be specified
+ and attribute names are not case sensitive. In addition,
attributes can either be specified
as an XML attribute or as an XML element that has no attributes
and has a text value. So
</p>
<pre class="prettyprint"><![CDATA[<PatternLayout
pattern="%m%n"/>]]></pre>
