You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/03/04 15:22:42 UTC
[04/50] [abbrv] logging-log4j2 git commit: Revert "Make filters all
properly serializable."
Revert "Make filters all properly serializable."
This reverts commit 06a28d523b6d33bccbf90edffcb2f2a450b4f476.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8c14ca8f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8c14ca8f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8c14ca8f
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: 8c14ca8f35686e1c509b4fb9aaccf31d2c80c423
Parents: 67069c1
Author: Matt Sicker <bo...@gmail.com>
Authored: Mon Feb 29 19:10:17 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Mon Feb 29 19:14:36 2016 -0600
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/filter/BurstFilter.java | 5 +----
.../org/apache/logging/log4j/core/script/AbstractScript.java | 5 +----
.../main/java/org/apache/logging/log4j/core/script/Script.java | 1 -
.../java/org/apache/logging/log4j/core/script/ScriptFile.java | 1 -
.../java/org/apache/logging/log4j/core/script/ScriptRef.java | 1 -
5 files changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8c14ca8f/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
index 3b24ca6..9cc107b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.core.filter;
-import java.io.Serializable;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.DelayQueue;
@@ -172,9 +171,7 @@ public final class BurstFilter extends AbstractFilter {
*
* Consider this class private, package visibility for testing.
*/
- private static class LogDelay implements Delayed, Serializable {
-
- private static final long serialVersionUID = 1L;
+ private static class LogDelay implements Delayed {
LogDelay(final long expireTime) {
this.expireTime = expireTime;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8c14ca8f/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
index fb0bc39..9e331d6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
@@ -16,14 +16,11 @@
*/
package org.apache.logging.log4j.core.script;
-import java.io.Serializable;
-
/**
* Container for the language and body of a script.
*/
-public abstract class AbstractScript implements Serializable {
+public abstract class AbstractScript {
- private static final long serialVersionUID = 1L;
protected static final String DEFAULT_LANGUAGE = "JavaScript";
private final String language;
private final String scriptText;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8c14ca8f/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java
index fa0842f..3f0c1da 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java
@@ -30,7 +30,6 @@ import org.apache.logging.log4j.status.StatusLogger;
@Plugin(name = "Script", category = Node.CATEGORY, printObject = true)
public class Script extends AbstractScript {
- private static final long serialVersionUID = 1L;
private static final Logger logger = StatusLogger.getLogger();
public Script(String name, String language, String scriptText) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8c14ca8f/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java
index b180032..f2fe085 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java
@@ -43,7 +43,6 @@ import org.apache.logging.log4j.status.StatusLogger;
@Plugin(name = "ScriptFile", category = Node.CATEGORY, printObject = true)
public class ScriptFile extends AbstractScript {
- private static final long serialVersionUID = 1L;
private static final Logger LOGGER = StatusLogger.getLogger();
private final Path filePath;
private final boolean isWatched;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8c14ca8f/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
index 8507621..0ace830 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
@@ -31,7 +31,6 @@ import org.apache.logging.log4j.status.StatusLogger;
@Plugin(name = "ScriptRef", category = Node.CATEGORY, printObject = true)
public class ScriptRef extends AbstractScript {
- private static final long serialVersionUID = 1L;
private static final Logger logger = StatusLogger.getLogger();
private final ScriptManager scriptManager;