*) UTF-8 Bug solved (hopefully)

See: http://www.yacy-forum.de/viewtopic.php?p=25522 git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2569 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Sep 13, 2006 · bdc5159 · bdc5159
1 parent 13d0cff
commit bdc5159
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/source/de/anomic/http/httpTemplate.java b/source/de/anomic/http/httpTemplate.java
@@ -492,19 +492,19 @@ public static byte[] replacePattern(String key, Hashtable pattern, byte dflt[])
         Object value;
         if (pattern.containsKey(key)) {
             value = pattern.get(key);
-            //try {
-            if (value instanceof byte[]) {
-                replacement = (byte[]) value;
-            } else if (value instanceof String) {
-                replacement = ((String) value).getBytes();
-                //replacement = ((String) value).getBytes("UTF-8");
-            } else {
-                replacement = value.toString().getBytes();
-                //replacement = value.toString().getBytes("UTF-8");
+            try {
+                if (value instanceof byte[]) {
+                    replacement = (byte[]) value;
+                } else if (value instanceof String) {
+                    //replacement = ((String) value).getBytes();
+                    replacement = ((String) value).getBytes("UTF-8");
+                } else {
+                    //replacement = value.toString().getBytes();
+                    replacement = value.toString().getBytes("UTF-8");
+                }
+            } catch (UnsupportedEncodingException e) {
+                replacement = dflt;
             }
-//          } catch (UnsupportedEncodingException e) {
-//          replacement = dflt;
-//          }
         } else {
             replacement = dflt;
         }

diff --git a/source/de/anomic/http/httpdFileHandler.java b/source/de/anomic/http/httpdFileHandler.java
@@ -726,7 +726,7 @@ public void doResponse(Properties conProp, httpHeader requestHeader, OutputStrea
 
                         o = new serverByteBuffer();
                         if (zipContent) zippedOut = new GZIPOutputStream(o);
-                        httpTemplate.writeTemplate(fis, (zipContent) ? (OutputStream)zippedOut: (OutputStream)o, tp, "-UNRESOLVED_PATTERN-".getBytes());
+                        httpTemplate.writeTemplate(fis, (zipContent) ? (OutputStream)zippedOut: (OutputStream)o, tp, "-UNRESOLVED_PATTERN-".getBytes("UTF-8"));
                         if (zipContent) {
                             zippedOut.finish();
                             zippedOut.flush();