summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cpp/demo/IceGrid/sessionActivation/README4
-rw-r--r--cpp/src/IceGrid/AllocatableObjectCache.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/cpp/demo/IceGrid/sessionActivation/README b/cpp/demo/IceGrid/sessionActivation/README
index b2803ba3561..0dffa9e30f7 100644
--- a/cpp/demo/IceGrid/sessionActivation/README
+++ b/cpp/demo/IceGrid/sessionActivation/README
@@ -1,3 +1,7 @@
+This demo demonstrates the use of the session activation mode where
+the server is activated on demand once it is allocated by the client
+and it is deactivated when the client releases the server.
+
To run the demo, first start the IceGrid service:
$ icegridnode --Ice.Config=config.grid
diff --git a/cpp/src/IceGrid/AllocatableObjectCache.cpp b/cpp/src/IceGrid/AllocatableObjectCache.cpp
index 5797c06017f..b13d8175bb5 100644
--- a/cpp/src/IceGrid/AllocatableObjectCache.cpp
+++ b/cpp/src/IceGrid/AllocatableObjectCache.cpp
@@ -211,7 +211,7 @@ AllocatableObjectCache::allocateByType(const string& type, const ObjectAllocatio
}
catch(const SessionDestroyedException&)
{
- return;
+ return; // The request has been answered already, no need to throw here.
}
p->second.addAllocationRequest(request);