You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/05/22 19:59:05 UTC

[28/50] [abbrv] lucene-solr:jira/solr-11779: LUCENE-8320: Fix NPE in WindowsFS if target file exists but isn't open

LUCENE-8320: Fix NPE in WindowsFS if target file exists but isn't open


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/70cfe466
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/70cfe466
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/70cfe466

Branch: refs/heads/jira/solr-11779
Commit: 70cfe46689448e9e7c53ff50572ceadaf03325fc
Parents: 82ad857
Author: Simon Willnauer <si...@apache.org>
Authored: Fri May 18 19:24:45 2018 +0200
Committer: Simon Willnauer <si...@apache.org>
Committed: Fri May 18 19:38:11 2018 +0200

----------------------------------------------------------------------
 .../org/apache/lucene/mockfile/WindowsFS.java   | 18 +++++++-------
 .../apache/lucene/mockfile/TestWindowsFS.java   | 25 ++++++++++++++++++--
 2 files changed, 33 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/70cfe466/lucene/test-framework/src/java/org/apache/lucene/mockfile/WindowsFS.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/WindowsFS.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/WindowsFS.java
index ecf73b6..28ca368 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/WindowsFS.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/WindowsFS.java
@@ -138,14 +138,16 @@ public class WindowsFS extends HandleTrackingFS {
           // return a different i-node next time we call it with the target path and our onClose method will
           // trip an assert
           Map<Path, Integer> map = openFiles.get(key);
-          Integer v = map.remove(target);
-          if (v != null) {
-            Map<Path, Integer> pathIntegerMap = openFiles.computeIfAbsent(newKey, k -> new HashMap<>());
-            Integer existingValue = pathIntegerMap.getOrDefault(target, 0);
-            pathIntegerMap.put(target, existingValue + v);
-          }
-          if (map.isEmpty()) {
-            openFiles.remove(key);
+          if (map != null) {
+            Integer v = map.remove(target);
+            if (v != null) {
+              Map<Path, Integer> pathIntegerMap = openFiles.computeIfAbsent(newKey, k -> new HashMap<>());
+              Integer existingValue = pathIntegerMap.getOrDefault(target, 0);
+              pathIntegerMap.put(target, existingValue + v);
+            }
+            if (map.isEmpty()) {
+              openFiles.remove(key);
+            }
           }
         }
       }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/70cfe466/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java
index 5e0a687..dd6c35c 100644
--- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java
+++ b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java
@@ -31,8 +31,6 @@ import java.nio.file.StandardCopyOption;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.lucene.mockfile.FilterPath;
-import org.apache.lucene.mockfile.WindowsFS;
 import org.apache.lucene.util.Constants;
 
 /** Basic tests for WindowsFS */
@@ -155,4 +153,27 @@ public class TestWindowsFS extends MockFileSystemTestCase {
       t.join();
     }
   }
+
+  public void testMove() throws IOException {
+    Path dir = wrap(createTempDir());
+    OutputStream file = Files.newOutputStream(dir.resolve("file"));
+    file.write(1);
+    file.close();
+    Files.move(dir.resolve("file"), dir.resolve("target"));
+    assertTrue(Files.exists(dir.resolve("target")));
+    assertFalse(Files.exists(dir.resolve("file")));
+    try (InputStream stream = Files.newInputStream(dir.resolve("target"))) {
+      assertEquals(1, stream.read());
+    }
+    file = Files.newOutputStream(dir.resolve("otherFile"));
+    file.write(2);
+    file.close();
+
+    Files.move(dir.resolve("otherFile"), dir.resolve("target"), StandardCopyOption.REPLACE_EXISTING);
+    assertTrue(Files.exists(dir.resolve("target")));
+    assertFalse(Files.exists(dir.resolve("otherFile")));
+    try (InputStream stream = Files.newInputStream(dir.resolve("target"))) {
+      assertEquals(2, stream.read());
+    }
+  }
 }