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 2015/07/17 14:27:40 UTC
svn commit: r1691539 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/CHANGES.txt
lucene/core/src/java/org/apache/lucene/store/IndexInput.java
lucene/ivy-versions.properties lucene/misc/
Author: dweiss
Date: Fri Jul 17 12:27:40 2015
New Revision: 1691539
URL: http://svn.apache.org/r1691539
Log:
Reverting r1691535.
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/IndexInput.java
lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (contents, props changed)
lucene/dev/branches/branch_5x/lucene/misc/ (props changed)
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/IndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/IndexInput.java?rev=1691539&r1=1691538&r2=1691539&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/IndexInput.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/IndexInput.java Fri Jul 17 12:27:40 2015
@@ -20,23 +20,19 @@ package org.apache.lucene.store;
import java.io.Closeable;
import java.io.IOException;
-/**
- * Abstract base class for input from a file in a {@link Directory}. A
+/** Abstract base class for input from a file in a {@link Directory}. A
* random-access input stream. Used for all Lucene index input operations.
*
* <p>{@code IndexInput} may only be used from one thread, because it is not
* thread safe (it keeps internal state like file position). To allow
* multithreaded use, every {@code IndexInput} instance must be cloned before
- * it is used in another thread. Subclasses must therefore implement {@link #clone()},
+ * used in another thread. Subclasses must therefore implement {@link #clone()},
* returning a new {@code IndexInput} which operates on the same underlying
- * resource, but positioned independently.
- *
- * <p><b>Warning:</b> Lucene never closes cloned
- * {@code IndexInput}s, it will only call {@link #close()} on the original object.
- *
- * <p>If you access the cloned IndexInput after closing the original object,
- * any <code>readXXX</code> methods will throw {@link AlreadyClosedException}.
- *
+ * resource, but positioned independently. Lucene never closes cloned
+ * {@code IndexInput}s, it will only do this on the original one.
+ * The original instance must take care that cloned instances throw
+ * {@link AlreadyClosedException} when the original one is closed.
+
* @see Directory
*/
public abstract class IndexInput extends DataInput implements Cloneable,Closeable {
@@ -77,12 +73,10 @@ public abstract class IndexInput extends
}
/** {@inheritDoc}
- *
* <p><b>Warning:</b> Lucene never closes cloned
- * {@code IndexInput}s, it will only call {@link #close()} on the original object.
- *
- * <p>If you access the cloned IndexInput after closing the original object,
- * any <code>readXXX</code> methods will throw {@link AlreadyClosedException}.
+ * {@code IndexInput}s, it will only do this on the original one.
+ * The original instance must take care that cloned instances throw
+ * {@link AlreadyClosedException} when the original one is closed.
*/
@Override
public IndexInput clone() {
Modified: lucene/dev/branches/branch_5x/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/ivy-versions.properties?rev=1691539&r1=1691538&r2=1691539&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_5x/lucene/ivy-versions.properties Fri Jul 17 12:27:40 2015
@@ -69,6 +69,7 @@ com.sun.jersey.version = 1.9
/dom4j/dom4j = 1.6.1
/hsqldb/hsqldb = 1.8.0.10
/io.netty/netty = 3.7.0.Final
+/it.unimi.dsi/fastutil = 6.5.11
/jakarta-regexp/jakarta-regexp = 1.4
/javax.activation/activation = 1.1.1
/javax.inject/javax.inject= 1
@@ -80,6 +81,7 @@ com.sun.jersey.version = 1.9
/log4j/log4j = 1.2.17
/mecab/mecab-ipadic = 2.7.0-20070801
/mecab/mecab-naist-jdic = 0.6.3b-20111013
+/net.agkn/hll = 1.6.0
/net.arnx/jsonic = 1.2.7
/net.sf.ehcache/ehcache-core = 2.4.4
/net.sf.saxon/Saxon-HE = 9.6.0-2