You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2016/03/06 23:56:56 UTC

[1/3] logging-log4j2 git commit: Remove unused serialVersionUID.

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 5595c03d1 -> 0f27a6e57


Remove unused serialVersionUID.


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

Branch: refs/heads/master
Commit: a66721b0a685c4591486b84c538bd0b8f8d2342b
Parents: 5595c03
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Mar 6 16:55:07 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Mar 6 16:55:07 2016 -0600

----------------------------------------------------------------------
 .../java/org/apache/logging/log4j/core/config/LoggerConfig.java    | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a66721b0/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
index ee100b4..6700f77 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
@@ -434,8 +434,6 @@ public class LoggerConfig extends AbstractFilterable {
     @Plugin(name = ROOT, category = "Core", printObject = true)
     public static class RootLogger extends LoggerConfig {
 
-        private static final long serialVersionUID = 1L;
-
         @PluginFactory
         public static LoggerConfig createLogger(
                 // @formatter:off


[3/3] logging-log4j2 git commit: Annotate performance sensitive method.

Posted by ma...@apache.org.
Annotate performance sensitive method.


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

Branch: refs/heads/master
Commit: 0f27a6e57e23416c4c95e5ebee05675670167cef
Parents: ce06b54
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Mar 6 16:56:51 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Mar 6 16:56:51 2016 -0600

----------------------------------------------------------------------
 .../java/org/apache/logging/log4j/core/config/LoggerConfig.java   | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0f27a6e5/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
index 6700f77..7b34093 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
@@ -44,6 +44,7 @@ import org.apache.logging.log4j.core.util.Booleans;
 import org.apache.logging.log4j.core.util.Constants;
 import org.apache.logging.log4j.core.util.Loader;
 import org.apache.logging.log4j.message.Message;
+import org.apache.logging.log4j.util.PerformanceSensitive;
 import org.apache.logging.log4j.util.PropertiesUtil;
 import org.apache.logging.log4j.util.Strings;
 
@@ -373,8 +374,10 @@ public class LoggerConfig extends AbstractFilterable {
         }
     }
 
+    @PerformanceSensitive("allocation")
     protected void callAppenders(final LogEvent event) {
         final AppenderControl[] controls = appenders.get();
+        //noinspection ForLoopReplaceableByForEach
         for (int i = 0; i < controls.length; i++) {
             controls[i].callAppender(event);
         }


[2/3] logging-log4j2 git commit: Use final.

Posted by ma...@apache.org.
Use final.


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

Branch: refs/heads/master
Commit: ce06b5482550b00d3558227cb23a73e67bb7419b
Parents: a66721b
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Mar 6 16:55:14 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Mar 6 16:55:14 2016 -0600

----------------------------------------------------------------------
 .../logging/log4j/core/config/CronScheduledFuture.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce06b548/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java
index 47e07f3..a684dcb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java
@@ -29,26 +29,26 @@ public class CronScheduledFuture<V> implements ScheduledFuture<V> {
 
     private volatile ScheduledFuture<?> scheduledFuture;
 
-    public CronScheduledFuture(ScheduledFuture<V> future) {
+    public CronScheduledFuture(final ScheduledFuture<V> future) {
         this.scheduledFuture = future;
     }
 
-    void setScheduledFuture(ScheduledFuture<?> future) {
+    void setScheduledFuture(final ScheduledFuture<?> future) {
         this.scheduledFuture = future;
     }
 
     @Override
-    public long getDelay(TimeUnit unit) {
+    public long getDelay(final TimeUnit unit) {
         return scheduledFuture.getDelay(unit);
     }
 
     @Override
-    public int compareTo(Delayed delayed) {
+    public int compareTo(final Delayed delayed) {
         return scheduledFuture.compareTo(delayed);
     }
 
     @Override
-    public boolean cancel(boolean mayInterruptIfRunning) {
+    public boolean cancel(final boolean mayInterruptIfRunning) {
         return scheduledFuture.cancel(mayInterruptIfRunning);
     }
 
@@ -70,7 +70,7 @@ public class CronScheduledFuture<V> implements ScheduledFuture<V> {
 
     @Override
     @SuppressWarnings("unchecked")
-    public V get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+    public V get(final long timeout, final TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
         return (V) scheduledFuture.get(timeout, unit);
     }
 }