You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/11/06 00:35:35 UTC

git commit: [LOG4J2-881] AbstractLifecycle should not implement equals() and hashCode().

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 1b0f4f91a -> 3e898dd6a


[LOG4J2-881] AbstractLifecycle should not implement equals() and
hashCode().

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

Branch: refs/heads/master
Commit: 3e898dd6afe444ed187374fe91eacfe5f565f099
Parents: 1b0f4f9
Author: Gary Gregory <ga...@gmail.com>
Authored: Wed Nov 5 18:35:24 2014 -0500
Committer: Gary Gregory <ga...@gmail.com>
Committed: Wed Nov 5 18:35:24 2014 -0500

----------------------------------------------------------------------
 .../org/apache/logging/log4j/core/AbstractLifeCycle.java | 11 +++++------
 .../java/org/apache/logging/log4j/core/LifeCycle.java    |  7 +++++++
 .../log4j/core/filter/DynamicThresholdFilter.java        |  4 ++--
 .../apache/logging/log4j/core/net/server/JmsServer.java  |  6 ++++++
 .../log4j/core/util/DefaultShutdownCallbackRegistry.java |  6 ++++++
 src/changes/changes.xml                                  |  3 +++
 6 files changed, 29 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e898dd6/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
index bdb4e8e..f4fabab 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
@@ -37,8 +37,7 @@ public class AbstractLifeCycle implements LifeCycle, Serializable {
 
     private volatile LifeCycle.State state = LifeCycle.State.INITIALIZED;
 
-    @Override
-    public boolean equals(final Object obj) {
+    protected boolean equalsImpl(final Object obj) {
         if (this == obj) {
             return true;
         }
@@ -48,19 +47,19 @@ public class AbstractLifeCycle implements LifeCycle, Serializable {
         if (getClass() != obj.getClass()) {
             return false;
         }
-        final AbstractLifeCycle other = (AbstractLifeCycle) obj;
-        if (state != other.state) {
+        final LifeCycle other = (LifeCycle) obj;
+        if (state != other.getState()) {
             return false;
         }
         return true;
     }
 
+    @Override
     public LifeCycle.State getState() {
         return this.state;
     }
 
-    @Override
-    public int hashCode() {
+    protected int hashCodeImpl() {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((state == null) ? 0 : state.hashCode());

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e898dd6/log4j-core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java
index e75ebd5..342fa4a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java
@@ -45,6 +45,13 @@ public interface LifeCycle {
         STOPPED
     }
     
+    /**
+     * Gets the life-cycle state
+     * 
+     * @return the life-cycle state
+     */
+    State getState();
+    
     void start();
 
     void stop();

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e898dd6/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
index 11758db..48747da 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
@@ -85,7 +85,7 @@ public final class DynamicThresholdFilter extends AbstractFilter {
         if (this == obj) {
             return true;
         }
-        if (!super.equals(obj)) {
+        if (!super.equalsImpl(obj)) {
             return false;
         }
         if (getClass() != obj.getClass()) {
@@ -163,7 +163,7 @@ public final class DynamicThresholdFilter extends AbstractFilter {
     @Override
     public int hashCode() {
         final int prime = 31;
-        int result = super.hashCode();
+        int result = super.hashCodeImpl();
         result = prime * result + ((defaultThreshold == null) ? 0 : defaultThreshold.hashCode());
         result = prime * result + ((key == null) ? 0 : key.hashCode());
         result = prime * result + ((levelMap == null) ? 0 : levelMap.hashCode());

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e898dd6/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/JmsServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/JmsServer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/JmsServer.java
index 82b6238..1e80a6a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/JmsServer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/JmsServer.java
@@ -56,6 +56,11 @@ public class JmsServer extends LogEventListener implements MessageListener, Life
     }
 
     @Override
+    public State getState() {
+        return state.get();
+    }
+
+    @Override
     public void onMessage(final Message message) {
         try {
             if (message instanceof ObjectMessage) {
@@ -104,4 +109,5 @@ public class JmsServer extends LogEventListener implements MessageListener, Life
     public boolean isStopped() {
         return state.get() == State.STOPPED;
     }
+
 }

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e898dd6/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DefaultShutdownCallbackRegistry.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DefaultShutdownCallbackRegistry.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DefaultShutdownCallbackRegistry.java
index 7628559..33628d2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DefaultShutdownCallbackRegistry.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/DefaultShutdownCallbackRegistry.java
@@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LifeCycle;
+import org.apache.logging.log4j.core.LifeCycle.State;
 import org.apache.logging.log4j.status.StatusLogger;
 
 /**
@@ -157,6 +158,11 @@ public class DefaultShutdownCallbackRegistry implements ShutdownCallbackRegistry
         }
     }
 
+    @Override
+    public State getState() {
+        return state.get();
+    }
+
     /**
      * Indicates if this can accept shutdown hooks.
      *

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e898dd6/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3a61475..45a6b6d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,9 @@
   </properties>
   <body>
     <release version="2.1.1" date="201?-??-??" description="GA Release 2.1.1">
+      <action issue="LOG4J2-881" dev="ggregory" type="fix" due-to="Mariano Gonzalez">
+        AbstractLifecycle should not implement equals() and hashCode().
+      </action>
       <action issue="LOG4J2-881" dev="ggregory" type="update">
         Update Jackson from 2.4.2 to 2.4.3.
       </action>