Bug 3201 - freeze file system demo errata

Add missing "_destroyed = true". Aligned file and directory destroy implementations.
Made spelling of error messages consistent.

2 files changed, 12 insertions, 7 deletions

diff --git a/java/demo/book/freeze_filesystem/DirectoryI.java b/java/demo/book/freeze_filesystem/DirectoryI.java
index c3c90cffb09..d551f487910 100644
--- a/java/demo/book/freeze_filesystem/DirectoryI.java
+++ b/java/demo/book/freeze_filesystem/DirectoryI.java
@@ -42,7 +42,7 @@ public final class DirectoryI extends PersistentDirectory
     {
         if(parent == null)
         {
-            throw new PermissionDenied("cannot remove root directory");
+            throw new PermissionDenied("cannot destroy root directory");
         }
 
         synchronized(this)
@@ -53,8 +53,9 @@ public final class DirectoryI extends PersistentDirectory
             }
             if(!nodes.isEmpty())
             {
-                throw new PermissionDenied("Cannot destroy non-empty directory");
+                throw new PermissionDenied("cannot destroy non-empty directory");
             }
+	    _destroyed = true;
         }
 
         parent.removeNode(nodeName);
diff --git a/java/demo/book/freeze_filesystem/FileI.java b/java/demo/book/freeze_filesystem/FileI.java
index 010998b5524..8b84ae13b34 100644
--- a/java/demo/book/freeze_filesystem/FileI.java
+++ b/java/demo/book/freeze_filesystem/FileI.java
@@ -35,14 +35,18 @@ public final class FileI extends PersistentFile
         return nodeName;
     }
 
-    public synchronized void
+    public void
     destroy(Ice.Current current)
         throws PermissionDenied
     {
-        if(_destroyed)
-        {
-            throw new Ice.ObjectNotExistException(current.id, current.facet, current.operation);
-        }
+        synchronized(this)
+	{
+	    if(_destroyed)
+	    {
+		throw new Ice.ObjectNotExistException(current.id, current.facet, current.operation);
+	    }
+	    _destroyed = true;
+	}
 
         parent.removeNode(nodeName);
         _evictor.remove(_id);