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/11/24 19:41:32 UTC

svn commit: r1205956 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/src/java/org/apache/lucene/store/MMapDirectory.java

Author: uschindler
Date: Thu Nov 24 18:41:32 2011
New Revision: 1205956

URL: http://svn.apache.org/viewvc?rev=1205956&view=rev
Log:
Merged revision(s) 1205954 from lucene/dev/trunk:
LUCENE-3588: Missed NPE -> AlreadyClosedException in getFilePointer

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/store/MMapDirectory.java

Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/store/MMapDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/store/MMapDirectory.java?rev=1205956&r1=1205955&r2=1205956&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/store/MMapDirectory.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/store/MMapDirectory.java Thu Nov 24 18:41:32 2011
@@ -350,7 +350,11 @@ public class MMapDirectory extends FSDir
     
     @Override
     public long getFilePointer() {
-      return (((long) curBufIndex) << chunkSizePower) + curBuf.position();
+      try {
+        return (((long) curBufIndex) << chunkSizePower) + curBuf.position();
+      } catch (NullPointerException npe) {
+        throw new AlreadyClosedException("MMapIndexInput already closed: " + this);
+      }
     }
   
     @Override