You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2011/02/04 13:27:17 UTC
svn commit: r1067163 - in /lucene/dev/trunk/solr:
contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/
src/java/org/apache/solr/response/
src/webapp/src/org/apache/solr/servlet/cache/
Author: uschindler
Date: Fri Feb 4 12:27:16 2011
New Revision: 1067163
URL: http://svn.apache.org/viewvc?rev=1067163&view=rev
Log:
More charset violations
Modified:
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
lucene/dev/trunk/solr/src/java/org/apache/solr/response/SolrParamResourceLoader.java
lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java?rev=1067163&r1=1067162&r2=1067163&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java Fri Feb 4 12:27:16 2011
@@ -46,7 +46,7 @@ public class TestXPathEntityProcessor ex
tmpdir.delete();
tmpdir.mkdir();
tmpdir.deleteOnExit();
- createFile(tmpdir, "x.xsl", xsl.getBytes(), false);
+ createFile(tmpdir, "x.xsl", xsl.getBytes("UTF-8"), false);
Map entityAttrs = createMap("name", "e", "url", "cd.xml",
XPathEntityProcessor.FOR_EACH, "/catalog/cd");
List fields = new ArrayList();
@@ -211,7 +211,7 @@ public class TestXPathEntityProcessor ex
tmpdir.delete();
tmpdir.mkdir();
tmpdir.deleteOnExit();
- TestFileListEntityProcessor.createFile(tmpdir, "x.xsl", xsl.getBytes(),
+ TestFileListEntityProcessor.createFile(tmpdir, "x.xsl", xsl.getBytes("UTF-8"),
false);
Map entityAttrs = createMap("name", "e",
XPathEntityProcessor.USE_SOLR_ADD_SCHEMA, "true", "xsl", ""
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/response/SolrParamResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/response/SolrParamResourceLoader.java?rev=1067163&r1=1067162&r2=1067163&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/response/SolrParamResourceLoader.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/response/SolrParamResourceLoader.java Fri Feb 4 12:27:16 2011
@@ -25,6 +25,7 @@ import org.apache.commons.collections.Ex
import java.io.ByteArrayInputStream;
import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -56,7 +57,11 @@ public class SolrParamResourceLoader ext
@Override
public InputStream getResourceStream(String s) throws ResourceNotFoundException {
String template = templates.get(s);
- return template == null ? null : new ByteArrayInputStream(template.getBytes());
+ try {
+ return template == null ? null : new ByteArrayInputStream(template.getBytes("UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e); // may not happen
+ }
}
@Override
Modified: lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java?rev=1067163&r1=1067162&r2=1067163&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java (original)
+++ lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java Fri Feb 4 12:27:16 2011
@@ -18,6 +18,7 @@
package org.apache.solr.servlet.cache;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.util.Collections;
import java.util.Map;
import java.util.WeakHashMap;
@@ -75,11 +76,15 @@ public final class HttpCacheHeaderUtil {
if (currentIndexVersion != indexVersionCache) {
indexVersionCache=currentIndexVersion;
- etagCache = "\""
- + new String(Base64.encodeBase64((Long.toHexString
- (Long.reverse(indexVersionCache))
- + etagSeed).getBytes()))
- + "\"";
+ try {
+ etagCache = "\""
+ + new String(Base64.encodeBase64((Long.toHexString
+ (Long.reverse(indexVersionCache))
+ + etagSeed).getBytes()), "US-ASCII")
+ + "\"";
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e); // may not happen
+ }
}
return etagCache;