This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-utils. See https://gitlab.nuiton.org/nuiton/nuiton-utils.git commit 742ed64af37fccb02f7e085dc83ca13b3f6606b4 Author: Arnaud Thimel <thimel@codelutin.com> Date: Wed Sep 25 17:28:51 2019 +0200 Fix some vulnerabilities --- src/main/java/org/nuiton/util/FileUtil.java | 10 ++-------- .../org/nuiton/util/LoggingPatternFormatter.java | 21 ++++++--------------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/nuiton/util/FileUtil.java b/src/main/java/org/nuiton/util/FileUtil.java index ac1b076..148bee2 100644 --- a/src/main/java/org/nuiton/util/FileUtil.java +++ b/src/main/java/org/nuiton/util/FileUtil.java @@ -29,10 +29,7 @@ import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JFileChooser; -import java.awt.Component; import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; @@ -43,7 +40,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintStream; import java.nio.CharBuffer; @@ -51,6 +47,7 @@ import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -75,16 +72,13 @@ import java.util.regex.Pattern; */ public class FileUtil { // FileUtil - /** - * Logger. - */ private static final Log log = LogFactory.getLog(FileUtil.class); /** * Encoding utilisé (peut être redéfini) */ // TODO fdesbois 2011-04-16 : Perhaps change ISO encoding by UTF-8 - public static String ENCODING = "ISO-8859-1"; + public static final String ENCODING = StandardCharsets.ISO_8859_1.name(); /** * Permet de convertir des bytes en fichier, le fichier sera automatiquement diff --git a/src/main/java/org/nuiton/util/LoggingPatternFormatter.java b/src/main/java/org/nuiton/util/LoggingPatternFormatter.java index c0b350d..245a856 100644 --- a/src/main/java/org/nuiton/util/LoggingPatternFormatter.java +++ b/src/main/java/org/nuiton/util/LoggingPatternFormatter.java @@ -20,21 +20,11 @@ * #L% */ -/** - * PatternFormatter.java - * <p> - * Created: Sat Apr 20 2002 - * - * @author POUSSIN Benjamin <bpoussin@free.fr> - * Copyright Code Lutin - * <p> - * <p> - * Mise a jour: $Date$ - * par : $Author$ - */ - package org.nuiton.util; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import java.io.PrintWriter; import java.io.StringWriter; import java.text.SimpleDateFormat; @@ -92,6 +82,8 @@ import java.util.logging.LogRecord; */ public class LoggingPatternFormatter extends Formatter { // PatternFormatter + private static final Log log = LogFactory.getLog(LoggingPatternFormatter.class); + private static final String DEFAULT_PATTERN = "%d{yyyy-MM-dd HH:mm:ss} [free:%o{-7}|total:%O{-7}][%t][%p{7}] %c{org.nuiton.*|25} %M{15:105}: %m%n%e"; protected HashMap<String, Class<?>> arguments = null; @@ -111,8 +103,7 @@ public class LoggingPatternFormatter extends Formatter { // PatternFormatter pattern = DEFAULT_PATTERN; compilePattern(pattern); } catch (Exception eee) { - System.err.println("Impossible d'utiliser le PatternFormatter"); - eee.printStackTrace(); + log.error("Impossible d'utiliser le PatternFormatter", eee); throw new LoggingException( "Exception durant l'initialisation du PatternFormatter", eee); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.