LOG4J2-1665 make IntegerPatternConverter garbage-free

84e16b88 · rpopma · e0058d67 · 84e16b88 · 84e16b88
Commit 84e16b88 authored 8 years ago by rpopma
Hide whitespace changes
Inline Side-by-side

Showing

with 10 additions and 9 deletions
+10 -9
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/IntegerPatternConverter.java
@@ -20,14 +20,13 @@ import java.util.Date;

 import org.apache.logging.log4j.core.config.plugins.Plugin;

-
 /**
 * Formats an integer.
 */
 @Plugin(name = "IntegerPatternConverter", category = "FileConverter")
 @ConverterKeys({ "i", "index" })
 public final class IntegerPatternConverter extends AbstractPatternConverter implements ArrayPatternConverter {
-    
+
    /**
     * Singleton.
     */
@@ -46,16 +45,15 @@ public final class IntegerPatternConverter extends AbstractPatternConverter impl
     * @param options options, may be null.
     * @return instance of pattern converter.
     */
-    public static IntegerPatternConverter newInstance(
-        final String[] options) {
+    public static IntegerPatternConverter newInstance(final String[] options) {
        return INSTANCE;
    }

    @Override
    public void format(final StringBuilder toAppendTo, final Object... objects) {
-        for (final Object obj : objects) {
-            if (obj instanceof Integer) {
-                format(obj, toAppendTo);
+        for (int i = 0; i < objects.length; i++) {
+            if (objects[i] instanceof Integer) {
+                format(objects[i], toAppendTo);
                break;
            }
        }
@@ -67,9 +65,9 @@ public final class IntegerPatternConverter extends AbstractPatternConverter impl
    @Override
    public void format(final Object obj, final StringBuilder toAppendTo) {
        if (obj instanceof Integer) {
-            toAppendTo.append(obj.toString());
+            toAppendTo.append(((Integer) obj).intValue());
        } else if (obj instanceof Date) {
-            toAppendTo.append(Long.toString(((Date) obj).getTime()));
+            toAppendTo.append(((Date) obj).getTime());
        }
    }
 }
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,9 @@
  </properties>
  <body>
    <release version="2.8" date="2016-MM-DD" description="GA Release 2.8">
+      <action issue="LOG4J2-1665" dev="rpopma" type="fix">
+        (GC) Avoid allocating temporary objects in IntegerPatternConverter.
+      </action>
      <action issue="LOG4J2-1637" dev="rpopma" type="fix">
        Fixed problems when used in OSGi containers (IllegalAccessError, NoClassDefFoundError).
      </action>