diff --git a/src/java/org/apache/lucene/store/FSDirectory.java b/src/java/org/apache/lucene/store/FSDirectory.java
index 6587e4f6019..944444de1e4 100644
--- a/src/java/org/apache/lucene/store/FSDirectory.java
+++ b/src/java/org/apache/lucene/store/FSDirectory.java
@@ -60,9 +60,7 @@ import java.io.RandomAccessFile;
import java.io.FileNotFoundException;
import java.util.Hashtable;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.InputStream;
-import org.apache.lucene.store.OutputStream;
+import org.apache.lucene.util.Constants;
/**
Straightforward implementation of Directory as a directory of files.
@@ -213,9 +211,11 @@ final public class FSDirectory extends Directory {
final File lockFile = new File(directory, name);
return new Lock() {
public boolean obtain() throws IOException {
- return lockFile.createNewFile();
+ if (Constants.JAVA_1_1) return true; // locks disabled in jdk 1.1
+ return lockFile.createNewFile();
}
public void release() {
+ if (Constants.JAVA_1_1) return; // locks disabled in jdk 1.1
lockFile.delete();
}
public String toString() {
diff --git a/src/java/org/apache/lucene/util/Constants.java b/src/java/org/apache/lucene/util/Constants.java
new file mode 100644
index 00000000000..cc9df4a41ff
--- /dev/null
+++ b/src/java/org/apache/lucene/util/Constants.java
@@ -0,0 +1,84 @@
+package org.apache.lucene.util;
+
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Lucene" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * "Apache Lucene", nor may "Apache" appear in their name, without
+ * prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * .
+ */
+
+/**
+ * Some useful constants.
+ *
+ * @author Doug Cutting
+ * @version $Id$
+ **/
+
+public final class Constants {
+ private Constants() {} // can't construct
+
+ /** The value of System.getProperty("java.version"). **/
+ public static final String JAVA_VERSION = System.getProperty("java.version");
+ /** True iff this is Java version 1.1. */
+ public static final boolean JAVA_1_1 = JAVA_VERSION.startsWith("1.1.");
+ /** True iff this is Java version 1.2. */
+ public static final boolean JAVA_1_2 = JAVA_VERSION.startsWith("1.2.");
+ /** True iff this is Java version 1.3. */
+ public static final boolean JAVA_1_3 = JAVA_VERSION.startsWith("1.3.");
+
+ /** The value of System.getProperty("os.name"). **/
+ public static final String OS_NAME = System.getProperty("os.name");
+ /** True iff running on Windows. */
+ public static final boolean LINUX = OS_NAME.startsWith("Linux");
+ /** True iff running on Windows. */
+ public static final boolean WINDOWS = OS_NAME.startsWith("Windows");
+ /** True iff running on SunOS. */
+ public static final boolean SUN_OS = OS_NAME.startsWith("SunOS");
+}