Changeset 99

Timestamp:

10/11/02 15:30:21 (21 years ago)

Author:

piso

Message:

load(): write locking.

File:

• trunk/j/src/org/armedbear/j/Man.java (modified) (2 diffs)

trunk/j/src/org/armedbear/j/Man.java

@@ -3 +3 @@
  *
  * Copyright (C) 2000-2002 Peter Graves
- * $Id: Man.java,v 1.2 2002-10-11 01:42:37 piso Exp $
+ * $Id: Man.java,v 1.3 2002-10-11 15:30:21 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -60 +60 @@
     {
         if (!isLoaded()) {
-            final File toBeLoaded = getFile();
-            if (toBeLoaded.isFile()) {
-                try {
-                    load(toBeLoaded.getInputStream());
+            try {
+                lockWrite();
+            }
+            catch (InterruptedException e) {
+                Log.debug(e);
+                return LOAD_FAILED;
+            }
+            try {
+                final File toBeLoaded = getFile();
+                if (toBeLoaded.isFile()) {
+                    try {
+                        _load(toBeLoaded.getInputStream());
+                    }
+                    catch (IOException e) {
+                        Log.error(e);
+                    }
+                    // Handle zero length files.
+                    if (getFirstLine() == null) {
+                        appendLine("");
+                        lineSeparator = System.getProperty("line.separator");
+                    }
+                    setLastModified(toBeLoaded.lastModified());
+                    renumber();
+                    formatter.parseBuffer();
                 }
-                catch (IOException e) {
-                    Log.error(e);
+                Line line = getFirstLine();
+                while (line != null && line.isBlank()) {
+                    line = line.next();
+                    setFirstLine(line);
                 }
-                // Handle zero length files.
-                if (getFirstLine() == null) {
+                final Line firstLine = getFirstLine();
+                if (firstLine == null) {
                     appendLine("");
-                    lineSeparator = System.getProperty("line.separator");
+                    setLoaded(true);
+                    return LOAD_FAILED;
                 }
-                setLastModified(toBeLoaded.lastModified());
+                firstLine.setPrevious(null);
+                String header = firstLine.getText();
+                for (line = firstLine.next(); line != null; line = line.next()) {
+                    if (line.isBlank() && line.previous() != null && line.previous().isBlank())
+                        remove(line);
+                    else if (line.getText().equals(header))
+                        remove(line);
+                }
                 renumber();
-                formatter.parseBuffer();
+                setLoaded(true);
             }
-            setLoaded(true);
+            finally {
+                unlockWrite();
+            }
         }
-        Line line = getFirstLine();
-        while (line != null && line.isBlank()) {
-            line = line.next();
-            setFirstLine(line);
-        }
-        if (getFirstLine() == null)
-            return LOAD_FAILED;
-        getFirstLine().setPrevious(null);
-        String header = getFirstLine().getText();
-        for (line = getFirstLine().next(); line != null; line = line.next()) {
-            if (line.isBlank() && line.previous() != null && line.previous().isBlank())
-                remove(line);
-            else if (line.getText().equals(header))
-                remove(line);
-        }
-        renumber();
         return LOAD_COMPLETED;
     }
 
-    public void load(InputStream istream)
+    private void _load(InputStream istream)
     {
         byte[] buf = new byte[4096];