From 0a169719c7db6cce410001c0389f27ee74bda286 Mon Sep 17 00:00:00 2001
From: Noble Paul <noble@apache.org>
Date: Fri, 27 Feb 2015 13:05:04 +0000
Subject: [PATCH] SOLR-7168: Test failure :Could not remove the files in
 windows

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1662677 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/solr/core/SolrResourceLoader.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
index 0cc2229a1e3..36187a9c784 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
@@ -797,7 +797,6 @@ public class SolrResourceLoader implements ResourceLoader,Closeable
   public static void persistConfLocally(SolrResourceLoader loader, String resourceName, byte[] content) {
     // Persist locally
     File confFile = new File(loader.getConfigDir(), resourceName);
-    OutputStream out = null;
     try {
       File parentDir = confFile.getParentFile();
       if ( ! parentDir.isDirectory()) {
@@ -807,17 +806,17 @@ public class SolrResourceLoader implements ResourceLoader,Closeable
           throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, msg);
         }
       }
-      out = new FileOutputStream(confFile);
-      out.write(content);
+      try (OutputStream out = new FileOutputStream(confFile);) {
+        out.write(content);
+      }
       log.info("Written confile " + resourceName);
     } catch (IOException e) {
       final String msg = "Error persisting conf file " + resourceName;
       log.error(msg, e);
       throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, msg, e);
     } finally {
-      org.apache.commons.io.IOUtils.closeQuietly(out);
       try {
-        FileUtils.sync(confFile);
+        IOUtils.fsync(confFile.toPath(), false);
       } catch (IOException e) {
         final String msg = "Error syncing conf file " + resourceName;
         log.error(msg, e);