Changeset 10759

Timestamp:

May 4, 2011, 7:21:57 PM (13 years ago)

Author:

mlg

Message:

Fixes problems with accents.

File:

• extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/util/Tools.java (modified) (3 diffs)

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/util/Tools.java

@@ -11 +11 @@
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
+import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -73 +74 @@
     private static final Logger LOG = LoggerFactory.getLogger(CategoryServiceImpl.class);
 
+    //    /**
+    //     * Transformation of an inpustream into string.<br/>
+    //     * useful to read the result of the webservice
+    //     * @param input the stream
+    //     * @return the string
+    //     * @throws IOException
+    //     */
+    //    public static String readInputStreamAsString(InputStream input) throws IOException {
+    //  StringWriter writer = new StringWriter();
+    //  InputStreamReader streamReader = new InputStreamReader(input);
+    //  BufferedReader buffer = new BufferedReader(streamReader);
+    //  String line = "";
+    //  while (null != (line = buffer.readLine())) {
+    //      writer.write(line);
+    //  }
+    //  return writer.toString();
+    //    }
+
     /**
      * Transformation of an inpustream into string.<br/>
@@ -80 +99 @@
      * @throws IOException
      */
-    public static String readInputStreamAsString(InputStream input) throws IOException {
-        StringWriter writer = new StringWriter();
-        InputStreamReader streamReader = new InputStreamReader(input);
-        BufferedReader buffer = new BufferedReader(streamReader);
-        String line = "";
-        while (null != (line = buffer.readLine())) {
-            writer.write(line);
-        }
-        return writer.toString();
+    public static String readInputStreamAsString(InputStream is) throws IOException {
+        if (is != null) {
+            Writer writer = new StringWriter();
+
+            char[] buffer = new char[1024];
+            try {
+                Reader reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+                int n;
+                while ((n = reader.read(buffer)) != -1) {
+                    writer.write(buffer, 0, n);
+                }
+            } finally {
+                is.close();
+            }
+            return writer.toString();
+        } else {
+            return "";
+        }
     }