From 4be5cba0142a9fbbc36220363f3e59c5d1e3ffdd Mon Sep 17 00:00:00 2001
From: Jeff Thomas <jeffrey.thomas@t-systems.com>
Date: Tue, 11 Feb 2025 23:36:28 +0100
Subject: [PATCH 1/4] Fixed AbstractFilterable#isFiltered javadoc (#3300)

---
 .../logging/log4j/core/filter/AbstractFilterable.java  |  3 ++-
 src/changelog/2.25.0/3300_fix-javadoc.xml              | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 src/changelog/2.25.0/3300_fix-javadoc.xml

diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
index 138ec820cae..74f0790ad3b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
@@ -145,7 +145,8 @@ public boolean hasFilter() {
     /**
      * Determine if the LogEvent should be processed or ignored.
      * @param event The LogEvent.
-     * @return true if the LogEvent should be processed.
+     * @return {@code true} if the event is filtered and should be ignored; otherwise, {@code false} if
+     *            it should be processed
      */
     @Override
     public boolean isFiltered(final LogEvent event) {
diff --git a/src/changelog/2.25.0/3300_fix-javadoc.xml b/src/changelog/2.25.0/3300_fix-javadoc.xml
new file mode 100644
index 00000000000..5d84b4325cb
--- /dev/null
+++ b/src/changelog/2.25.0/3300_fix-javadoc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://logging.apache.org/xml/ns"
+       xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
+       type="fixed">
+  <issue id="3300" link="https://github.com/apache/logging-log4j2/issues/3300"/>
+  <description format="asciidoc">
+    Corrected @return javadoc for AbstractFilterable#isFiltered().
+  </description>
+</entry>

From 8963aa6a357037f428e6b2fe5e8a4cde13a997e0 Mon Sep 17 00:00:00 2001
From: Jeff Thomas <jeffrey.thomas@t-systems.com>
Date: Sun, 16 Feb 2025 20:42:13 +0100
Subject: [PATCH 2/4] Moved changelog to .2.x.x per PR Code Review (#3300)

---
 src/changelog/{2.25.0 => .2.x.x}/3300_fix-javadoc.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/changelog/{2.25.0 => .2.x.x}/3300_fix-javadoc.xml (100%)

diff --git a/src/changelog/2.25.0/3300_fix-javadoc.xml b/src/changelog/.2.x.x/3300_fix-javadoc.xml
similarity index 100%
rename from src/changelog/2.25.0/3300_fix-javadoc.xml
rename to src/changelog/.2.x.x/3300_fix-javadoc.xml

From e98e16045c87698cab949e1ede50637bf58df5df Mon Sep 17 00:00:00 2001
From: Jeff Thomas <jeffrey.thomas@t-systems.com>
Date: Tue, 11 Feb 2025 23:36:28 +0100
Subject: [PATCH 3/4] Fixed AbstractFilterable#isFiltered javadoc (#3300)

---
 src/changelog/2.25.0/3300_fix-javadoc.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 src/changelog/2.25.0/3300_fix-javadoc.xml

diff --git a/src/changelog/2.25.0/3300_fix-javadoc.xml b/src/changelog/2.25.0/3300_fix-javadoc.xml
new file mode 100644
index 00000000000..5d84b4325cb
--- /dev/null
+++ b/src/changelog/2.25.0/3300_fix-javadoc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://logging.apache.org/xml/ns"
+       xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
+       type="fixed">
+  <issue id="3300" link="https://github.com/apache/logging-log4j2/issues/3300"/>
+  <description format="asciidoc">
+    Corrected @return javadoc for AbstractFilterable#isFiltered().
+  </description>
+</entry>

From 3dc679112c102f92f1a0949b349726908e7c7a9f Mon Sep 17 00:00:00 2001
From: Jeff Thomas <jeffrey.thomas@t-systems.com>
Date: Sun, 16 Feb 2025 20:42:13 +0100
Subject: [PATCH 4/4] Moved changelog to .2.x.x per PR Code Review (#3300)

---
 src/changelog/2.25.0/3300_fix-javadoc.xml | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 src/changelog/2.25.0/3300_fix-javadoc.xml

diff --git a/src/changelog/2.25.0/3300_fix-javadoc.xml b/src/changelog/2.25.0/3300_fix-javadoc.xml
deleted file mode 100644
index 5d84b4325cb..00000000000
--- a/src/changelog/2.25.0/3300_fix-javadoc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns="https://logging.apache.org/xml/ns"
-       xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
-       type="fixed">
-  <issue id="3300" link="https://github.com/apache/logging-log4j2/issues/3300"/>
-  <description format="asciidoc">
-    Corrected @return javadoc for AbstractFilterable#isFiltered().
-  </description>
-</entry>