[felix-dev] branch master updated: FELIX-6088 NPE in LoggerImpl when formatted logger called with null or empty arguments

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new 446bb68  FELIX-6088 NPE in LoggerImpl when formatted logger called with null or empty arguments
     new bc61de6  Merge pull request #23 from rotty3000/FELIX-6088
446bb68 is described below

commit 446bb68b8498a56d7b637dc5fecdfc3dd1ded54a
Author: Raymond Augé <ra...@liferay.com>
AuthorDate: Fri May 29 17:00:59 2020 -0400

    FELIX-6088 NPE in LoggerImpl when formatted logger called with null or empty arguments
---
 log/src/main/java/org/apache/felix/log/LoggerImpl.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/log/src/main/java/org/apache/felix/log/LoggerImpl.java b/log/src/main/java/org/apache/felix/log/LoggerImpl.java
index 7ec20e4..a9879f1 100644
--- a/log/src/main/java/org/apache/felix/log/LoggerImpl.java
+++ b/log/src/main/java/org/apache/felix/log/LoggerImpl.java
@@ -321,6 +321,9 @@ public class LoggerImpl implements Logger {
     }
 
     String format(String format, LogParameters logParameters) {
+        if (logParameters.isEmpty()) {
+            return format;
+        }
         StringBuilder sb = new StringBuilder();
         int offset = 0;
         int length = format.length();
@@ -369,6 +372,9 @@ public class LoggerImpl implements Logger {
             this.sr = sr;
             this.t = t;
         }
+        public boolean isEmpty() {
+            return (args == null) || (args.length == 0);
+        }
         final Object[] args;
         final ServiceReference<?> sr;
         final Throwable t;