Merge commit 'origin/R3_3_branch'

Conflicts:
	CHANGES
	cpp/demo/Freeze/backup/.depend
	cpp/demo/Freeze/bench/.depend
	cpp/demo/Freeze/casino/.depend
	cpp/demo/Freeze/customEvictor/.depend
	cpp/demo/Freeze/library/.depend
	cpp/demo/Freeze/phonebook/.depend
	cpp/demo/Freeze/transform/.depend
	cpp/demo/Glacier2/callback/.depend
	cpp/demo/Glacier2/chat/.depend
	cpp/demo/Ice/async/.depend
	cpp/demo/Ice/bidir/.depend
	cpp/demo/Ice/callback/.depend
	cpp/demo/Ice/converter/.depend
	cpp/demo/Ice/hello/.depend
	cpp/demo/Ice/invoke/.depend
	cpp/demo/Ice/latency/.depend
	cpp/demo/Ice/minimal/.depend
	cpp/demo/Ice/multicast/.depend
	cpp/demo/Ice/nested/.depend
	cpp/demo/Ice/nrvo/.depend
	cpp/demo/Ice/session/.depend
	cpp/demo/Ice/throughput/.depend
	cpp/demo/Ice/value/.depend
	cpp/demo/IceBox/hello/.depend
	cpp/demo/IceGrid/allocate/.depend
	cpp/demo/IceGrid/icebox/.depend
	cpp/demo/IceGrid/replication/.depend
	cpp/demo/IceGrid/sessionActivation/.depend
	cpp/demo/IceGrid/simple/.depend
	cpp/demo/IceStorm/clock/.depend
	cpp/demo/IceStorm/counter/.depend
	cpp/demo/IceStorm/replicated/.depend
	cpp/demo/IceStorm/replicated2/.depend
	cpp/demo/book/freeze_filesystem/.depend
	cpp/demo/book/lifecycle/.depend
	cpp/demo/book/printer/.depend
	cpp/demo/book/simple_filesystem/.depend
	cpp/src/Freeze/.depend
	cpp/src/FreezeScript/.depend
	cpp/src/Ice/.depend
	cpp/src/Ice/UdpTransceiver.cpp
	cpp/src/Ice/UdpTransceiver.h
	cpp/src/IceBox/.depend
	cpp/src/IceGrid/.depend
	cpp/src/IceGridLib/.depend
	cpp/src/IcePatch2/.depend
	cpp/src/IceStorm/.depend
	cpp/src/slice2freeze/.depend
	cpp/test/Freeze/complex/.depend
	cpp/test/Freeze/dbmap/.depend
	cpp/test/Freeze/evictor/.depend
	cpp/test/Freeze/oldevictor/.depend
	cpp/test/FreezeScript/dbmap/.depend
	cpp/test/FreezeScript/evictor/.depend
	cpp/test/Glacier2/attack/.depend
	cpp/test/Glacier2/dynamicFiltering/.depend
	cpp/test/Glacier2/router/.depend
	cpp/test/Glacier2/sessionControl/.depend
	cpp/test/Glacier2/ssl/.depend
	cpp/test/Glacier2/staticFiltering/.depend
	cpp/test/Ice/adapterDeactivation/.depend
	cpp/test/Ice/background/.depend
	cpp/test/Ice/binding/.depend
	cpp/test/Ice/checksum/.depend
	cpp/test/Ice/checksum/server/.depend
	cpp/test/Ice/custom/.depend
	cpp/test/Ice/exceptions/.depend
	cpp/test/Ice/facets/.depend
	cpp/test/Ice/faultTolerance/.depend
	cpp/test/Ice/gc/.depend
	cpp/test/Ice/hold/.depend
	cpp/test/Ice/inheritance/.depend
	cpp/test/Ice/interceptor/.depend
	cpp/test/Ice/location/.depend
	cpp/test/Ice/objects/.depend
	cpp/test/Ice/operations/.depend
	cpp/test/Ice/proxy/.depend
	cpp/test/Ice/retry/.depend
	cpp/test/Ice/servantLocator/.depend
	cpp/test/Ice/slicing/exceptions/.depend
	cpp/test/Ice/slicing/objects/.depend
	cpp/test/Ice/stream/.depend
	cpp/test/Ice/stringConverter/.depend
	cpp/test/Ice/timeout/.depend
	cpp/test/Ice/udp/.depend
	cpp/test/IceBox/configuration/.depend
	cpp/test/IceGrid/activation/.depend
	cpp/test/IceGrid/allocation/.depend
	cpp/test/IceGrid/deployer/.depend
	cpp/test/IceGrid/distribution/.depend
	cpp/test/IceGrid/replicaGroup/.depend
	cpp/test/IceGrid/replication/.depend
	cpp/test/IceGrid/session/.depend
	cpp/test/IceGrid/simple/.depend
	cpp/test/IceGrid/update/.depend
	cpp/test/IceSSL/configuration/.depend
	cpp/test/IceStorm/federation/.depend
	cpp/test/IceStorm/federation2/.depend
	cpp/test/IceStorm/rep1/.depend
	cpp/test/IceStorm/repgrid/.depend
	cpp/test/IceStorm/repstress/.depend
	cpp/test/IceStorm/single/.depend
	cpp/test/IceStorm/stress/.depend
	cpp/test/Slice/keyword/.depend
	cs/src/Ice/Instance.cs
	cs/src/IceSSL/ConnectorI.cs
	java/demo/book/simple_filesystem/Filesystem/DirectoryI.java
	java/demo/book/simple_filesystem/Filesystem/FileI.java
	java/src/IceInternal/TcpConnector.java
	java/src/IceSSL/ConnectorI.java
	py/modules/IcePy/.depend
	rb/src/IceRuby/.depend

1 files changed, 45 insertions, 25 deletions

diff --git a/cpp/demo/book/freeze_filesystem/PersistentFilesystemI.cpp b/cpp/demo/book/freeze_filesystem/PersistentFilesystemI.cpp
index 472500d2761..1cc4ec00f00 100644
--- a/cpp/demo/book/freeze_filesystem/PersistentFilesystemI.cpp
+++ b/cpp/demo/book/freeze_filesystem/PersistentFilesystemI.cpp
@@ -17,12 +17,12 @@ using namespace std;
 Freeze::EvictorPtr Filesystem::NodeI::_evictor;
 
 Filesystem::NodeI::NodeI()
-  : _id(Ice::Identity())
+  : _destroyed(false), _id(Ice::Identity())
 {
 }
 
 Filesystem::NodeI::NodeI(const Ice::Identity& id)
-    : _id(id)
+    : _destroyed(false), _id(id)
 {
 }
 
@@ -30,29 +30,58 @@ Filesystem::NodeI::NodeI(const Ice::Identity& id)
 // Filesystem::FileI
 //
 string
-Filesystem::FileI::name(const Ice::Current&)
+Filesystem::FileI::name(const Ice::Current& c)
 {
+    IceUtil::Mutex::Lock lock(*this);
+
+    if(_destroyed)
+    {
+        throw Ice::ObjectNotExistException(__FILE__, __LINE__, c.id, c.facet, c.operation);
+    }
+
     return nodeName;
 }
 
 void
-Filesystem::FileI::destroy(const Ice::Current&)
+Filesystem::FileI::destroy(const Ice::Current& c)
 {
+    {
+        IceUtil::Mutex::Lock lock(*this);
+
+	if(_destroyed)
+	{
+	    throw Ice::ObjectNotExistException(__FILE__, __LINE__, c.id, c.facet, c.operation);
+	}
+	_destroyed = true;
+    }
+
     parent->removeNode(nodeName);
     _evictor->remove(_id);
 }
 
 Filesystem::Lines
-Filesystem::FileI::read(const Ice::Current&)
+Filesystem::FileI::read(const Ice::Current& c)
 {
     IceUtil::Mutex::Lock lock(*this);
+
+    if(_destroyed)
+    {
+        throw Ice::ObjectNotExistException(__FILE__, __LINE__, c.id, c.facet, c.operation);
+    }
+
     return text;
 }
 
 void
-Filesystem::FileI::write(const Filesystem::Lines& text, const Ice::Current&)
+Filesystem::FileI::write(const Filesystem::Lines& text, const Ice::Current& c)
 {
     IceUtil::Mutex::Lock lock(*this);
+
+    if(_destroyed)
+    {
+        throw Ice::ObjectNotExistException(__FILE__, __LINE__, c.id, c.facet, c.operation);
+    }
+
     this->text = text;
 }
 
@@ -89,8 +118,6 @@ Filesystem::DirectoryI::destroy(const Ice::Current& c)
         throw Filesystem::PermissionDenied("cannot destroy root directory");
     }
 
-    NodeDict children;
-
     {
         IceUtil::Mutex::Lock lock(*this);
 
@@ -98,21 +125,13 @@ Filesystem::DirectoryI::destroy(const Ice::Current& c)
         {
             throw Ice::ObjectNotExistException(__FILE__, __LINE__, c.id, c.facet, c.operation);
         }
-
-        children = nodes;
+        if(!nodes.empty())
+        {
+            throw Filesystem::PermissionDenied("cannot destroy non-empty directory");
+        }
         _destroyed = true;
     }
 
-    //
-    // We must iterate over the children outside the synchronization.
-    //
-    for(NodeDict::iterator p = children.begin(); p != children.end(); ++p)
-    {
-        p->second.proxy->destroy();
-    }
-
-    assert(nodes.empty());
-
     parent->removeNode(nodeName);
     _evictor->remove(_id);
 }
@@ -169,7 +188,8 @@ Filesystem::DirectoryI::createDirectory(const string& name, const Ice::Current&
         throw NameInUse(name);
     }
 
-    Ice::Identity id = c.adapter->getCommunicator()->stringToIdentity(IceUtil::generateUUID());
+    Ice::Identity id;
+    id.name = IceUtil::generateUUID();
     PersistentDirectoryPtr dir = new DirectoryI(id);
     dir->nodeName = name;
     dir->parent = PersistentDirectoryPrx::uncheckedCast(c.adapter->createProxy(c.id));
@@ -199,7 +219,8 @@ Filesystem::DirectoryI::createFile(const string& name, const Ice::Current& c)
         throw NameInUse(name);
     }
 
-    Ice::Identity id = c.adapter->getCommunicator()->stringToIdentity(IceUtil::generateUUID());
+    Ice::Identity id;
+    id.name = IceUtil::generateUUID();
     PersistentFilePtr file = new FileI(id);
     file->nodeName = name;
     file->parent = PersistentDirectoryPrx::uncheckedCast(c.adapter->createProxy(c.id));
@@ -224,13 +245,12 @@ Filesystem::DirectoryI::removeNode(const string& name, const Ice::Current&)
     nodes.erase(p);
 }
 
-Filesystem::DirectoryI::DirectoryI() :
-    _destroyed(false)
+Filesystem::DirectoryI::DirectoryI()
 {
 }
 
 Filesystem::DirectoryI::DirectoryI(const Ice::Identity& id) :
-    NodeI(id), _destroyed(false)
+    NodeI(id)
 {
 }