You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/02/26 20:15:03 UTC
svn commit: r1662542 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
Author: noble
Date: Thu Feb 26 19:15:03 2015
New Revision: 1662542
URL: http://svn.apache.org/r1662542
Log:
SOLR-7168:TestSolrConfigHandler failure ,Could not remove the following files
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java?rev=1662542&r1=1662541&r2=1662542&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java Thu Feb 26 19:15:03 2015
@@ -55,6 +55,7 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.lang.reflect.Constructor;
import java.net.MalformedURLException;
@@ -796,7 +797,7 @@ public class SolrResourceLoader implemen
public static void persistConfLocally(SolrResourceLoader loader, String resourceName, byte[] content) {
// Persist locally
File confFile = new File(loader.getConfigDir(), resourceName);
- OutputStreamWriter writer = null;
+ OutputStream out = null;
try {
File parentDir = confFile.getParentFile();
if ( ! parentDir.isDirectory()) {
@@ -806,7 +807,7 @@ public class SolrResourceLoader implemen
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, msg);
}
}
- final FileOutputStream out = new FileOutputStream(confFile);
+ out = new FileOutputStream(confFile);
out.write(content);
log.info("Written confile " + resourceName);
} catch (IOException e) {
@@ -814,7 +815,7 @@ public class SolrResourceLoader implemen
log.error(msg, e);
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, msg, e);
} finally {
- org.apache.commons.io.IOUtils.closeQuietly(writer);
+ org.apache.commons.io.IOUtils.closeQuietly(out);
try {
FileUtils.sync(confFile);
} catch (IOException e) {