You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2012/07/06 12:29:29 UTC
svn commit: r1358107 - in /lucene/dev/trunk:
lucene/core/src/java/org/apache/lucene/util/IOUtils.java
solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java
solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
Author: dweiss
Date: Fri Jul 6 10:29:29 2012
New Revision: 1358107
URL: http://svn.apache.org/viewvc?rev=1358107&view=rev
Log:
LUCENE-4194: more solr default encoding fixes.
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/IOUtils.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/IOUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/IOUtils.java?rev=1358107&r1=1358106&r2=1358107&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/IOUtils.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/IOUtils.java Fri Jul 6 10:29:29 2012
@@ -21,6 +21,7 @@ import java.io.BufferedReader;
import java.io.Closeable;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -331,5 +332,24 @@ public final class IOUtils {
}
}
-
+ /**
+ * Copy one file's contents to another file. The target will be overwritten
+ * if it exists. The source must exist.
+ */
+ public static void copy(File source, File target) throws IOException {
+ FileInputStream fis = null;
+ FileOutputStream fos = null;
+ try {
+ fis = new FileInputStream(source);
+ fos = new FileOutputStream(target);
+
+ final byte [] buffer = new byte [1024 * 8];
+ int len;
+ while ((len = fis.read(buffer)) > 0) {
+ fos.write(buffer, 0, len);
+ }
+ } finally {
+ close(fis, fos);
+ }
+ }
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java?rev=1358107&r1=1358106&r2=1358107&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java Fri Jul 6 10:29:29 2012
@@ -26,6 +26,7 @@ import java.util.Set;
import org.apache.noggit.JSONParser;
import org.apache.lucene.analysis.util.ResourceLoader;
+import org.apache.lucene.util.IOUtils;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.slf4j.Logger;
@@ -181,7 +182,7 @@ public class OpenExchangeRatesOrgProvide
private JSONParser parser;
public OpenExchangeRates(InputStream ratesStream) throws IOException {
- parser = new JSONParser(new InputStreamReader(ratesStream));
+ parser = new JSONParser(new InputStreamReader(ratesStream, IOUtils.CHARSET_UTF_8));
rates = new HashMap<String, Double>();
int ev;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java?rev=1358107&r1=1358106&r2=1358107&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java Fri Jul 6 10:29:29 2012
@@ -16,6 +16,7 @@
*/
package org.apache.solr;
+import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -24,7 +25,6 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.commons.io.IOUtils;
import java.io.*;
import java.util.Properties;
@@ -115,29 +115,15 @@ public class TestSolrCoreProperties exte
confDir.mkdirs();
File f = new File(confDir, "solrconfig.xml");
- copyFile(SolrTestCaseJ4.getFile(getSolrConfigFile()), f);
+ IOUtils.copy(SolrTestCaseJ4.getFile(getSolrConfigFile()), f);
f = new File(confDir, "schema.xml");
- copyFile(SolrTestCaseJ4.getFile(getSchemaFile()), f);
+ IOUtils.copy(SolrTestCaseJ4.getFile(getSchemaFile()), f);
Properties p = new Properties();
p.setProperty("foo.foo1", "f1");
p.setProperty("foo.foo2", "f2");
FileOutputStream fos = new FileOutputStream(confDir + File.separator + "solrcore.properties");
p.store(fos, null);
- fos.close();
- IOUtils.closeQuietly(fos);
-
- }
-
-
- private void copyFile(File src, File dst) throws IOException {
- BufferedReader in = new BufferedReader(new FileReader(src));
- Writer out = new FileWriter(dst);
-
- for (String line = in.readLine(); null != line; line = in.readLine()) {
- out.write(line);
- }
- in.close();
- out.close();
+ IOUtils.close(fos);
}
}