From 78925aaf1212126292becdfd79cfcb99637bc63a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Wed, 26 Jan 2022 17:59:37 +0100 Subject: [PATCH] fix NPE --- .../graphics/pdfbox/layout/element/scripting/Engine.java | 5 ++++- .../org/xbib/graphics/pdfbox/layout/text/TextFlowUtil.java | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/Engine.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/Engine.java index fc93010..5fa186d 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/Engine.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/Engine.java @@ -1,5 +1,6 @@ package org.xbib.graphics.pdfbox.layout.element.scripting; +import java.util.logging.Level; import org.xbib.graphics.pdfbox.layout.element.scripting.command.Command; import org.xbib.settings.Settings; @@ -55,7 +56,9 @@ public class Engine implements Closeable { String className = packageName + ".command." + type.substring(0, 1).toUpperCase() + type.substring(1) + "Command"; Class cl = classLoader.loadClass(className); Command command = (Command) cl.getConstructor().newInstance(); - logger.finer("executing element " + type + " settings = " + settings.getAsMap()); + if (logger.isLoggable(Level.FINEST)) { + logger.log(Level.FINEST, "executing element " + type + " settings = " + settings.getAsMap()); + } command.execute(this, state, settings); } catch (Exception e) { throw new IOException(e); diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/text/TextFlowUtil.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/text/TextFlowUtil.java index 6c7b6cb..1c26736 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/text/TextFlowUtil.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/text/TextFlowUtil.java @@ -157,6 +157,9 @@ public class TextFlowUtil { * @return the create char sequence. */ public static Iterable fromPlainText(final CharSequence text) { + if (text == null) { + return fromPlainText(Collections.emptyList()); + } return fromPlainText(Collections.singleton(text)); } @@ -181,6 +184,9 @@ public class TextFlowUtil { * @return the create char sequence. */ public static Iterable fromMarkup(final CharSequence markup) { + if (markup == null) { + return fromMarkup(Collections.emptyList()); + } return fromMarkup(Collections.singleton(markup)); }