Improve secure logging

[lgpl/argeo-commons.git] / basic / runtime / org.argeo.basic.nodeps / src / main / java / org / argeo / util / CsvParser.java

diff --git a/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/CsvParser.java b/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/CsvParser.java
index c20f4e07c684c90902cef9fd473e16410286d64f..3a429f4adc23a634dfcff402203a20e2c83e04d0 100644 (file)
--- a/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/CsvParser.java
+++ b/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/CsvParser.java
@@ -40,11 +40,17 @@ public abstract class CsvParser {
                        List<String> header, List<String> tokens);
 
        public synchronized void parse(InputStream in) {
+               parse(in, null);
+       }
+
+       public synchronized void parse(InputStream in, String encoding) {
                BufferedReader reader = null;
                Integer lineCount = 0;
                try {
-                       reader = new BufferedReader(new InputStreamReader(in));
-
+                       if (encoding == null)
+                               reader = new BufferedReader(new InputStreamReader(in));
+                       else
+                               reader = new BufferedReader(new InputStreamReader(in, encoding));
                        List<String> header = null;
                        if (!noHeader) {
                                String headerStr = reader.readLine();