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:40 UTC

[02/50] [abbrv] logging-log4j2 git commit: Revert "[LOG4J2-1300] Make Advertiser implementations Serializable."

Revert "[LOG4J2-1300] Make Advertiser implementations Serializable."

This reverts commit ce7d5d230c98a815d1173ae63e19a6a064c4cafc.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0c00057a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0c00057a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0c00057a

Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: 0c00057a13091062df12d6c965ad1801eef3a45c
Parents: ea85196
Author: Matt Sicker <bo...@gmail.com>
Authored: Mon Feb 29 19:09:29 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Mon Feb 29 19:14:36 2016 -0600

----------------------------------------------------------------------
 .../apache/logging/log4j/core/net/MulticastDnsAdvertiser.java    | 4 +---
 .../org/apache/logging/log4j/core/config/InMemoryAdvertiser.java | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c00057a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
index 40d1956..479d25f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
@@ -16,7 +16,6 @@
  */
 package org.apache.logging.log4j.core.net;
 
-import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
@@ -37,8 +36,7 @@ import org.apache.logging.log4j.status.StatusLogger;
  *
  */
 @Plugin(name = "multicastdns", category = "Core", elementType = "advertiser", printObject = false)
-public class MulticastDnsAdvertiser implements Advertiser, Serializable {
-    private static final long serialVersionUID = 1L;
+public class MulticastDnsAdvertiser implements Advertiser {
     /**
      * Status logger.
      */

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0c00057a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
index 892c87c..81d9676 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
@@ -16,7 +16,6 @@
  */
 package org.apache.logging.log4j.core.config;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -24,8 +23,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
 import org.apache.logging.log4j.core.net.Advertiser;
 
 @Plugin(name = "memory", category = "Core", elementType = "advertiser", printObject = false)
-public class InMemoryAdvertiser implements Advertiser, Serializable {
-    private static final long serialVersionUID = 1L;
+public class InMemoryAdvertiser implements Advertiser {
     private static Map<Object, Map<String, String>> properties = new HashMap<>();
 
     public static Map<Object, Map<String, String>> getAdvertisedEntries()