From 79f8912b36d37a25867c52f86bcff13ff75e40a2 Mon Sep 17 00:00:00 2001 From: emusic Date: Fri, 8 Nov 2019 14:13:45 +0100 Subject: Encoding of special characters --- .../src/main/java/at/gv/egiz/pdfas/common/utils/OgnlUtils.java | 3 +++ .../src/main/java/at/gv/egiz/pdfas/common/utils/StringUtils.java | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils') diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/OgnlUtils.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/OgnlUtils.java index d5bae58e..50a34c57 100644 --- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/OgnlUtils.java +++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/OgnlUtils.java @@ -30,6 +30,8 @@ import ognl.OgnlException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.nio.charset.Charset; + /** * Created with IntelliJ IDEA. * User: afitzek @@ -52,6 +54,7 @@ public class OgnlUtils { valueString = valueString.substring(0, valueString.length() - 1); } return valueString; + } catch (OgnlException e) { logger.warn("OGNL resolver failed!", e); } diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StringUtils.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StringUtils.java index dbea3c70..7156a97b 100644 --- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StringUtils.java +++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StringUtils.java @@ -23,13 +23,13 @@ ******************************************************************************/ package at.gv.egiz.pdfas.common.utils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.Formatter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Created with IntelliJ IDEA. User: afitzek Date: 8/28/13 Time: 12:42 PM To * change this template use File | Settings | File Templates. @@ -62,7 +62,7 @@ public class StringUtils { public static String convertStringToPDFFormat(String value) throws UnsupportedEncodingException { - + if(value == null) { logger.warn("Trying to convert null string!"); return value; -- cgit v1.2.3