summaryrefslogtreecommitdiff
path: root/java/demo/book/lifecycle/Server.java
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2009-03-16 13:04:33 +1000
committerMichi Henning <michi@zeroc.com>2009-03-16 13:04:33 +1000
commitb5dcf9e990445413a77522ab0f352a9f7480cf81 (patch)
treeaa160721927e6274c98546bb4b1bba06f84191e2 /java/demo/book/lifecycle/Server.java
parentBug 3872 - project dependencies (diff)
downloadice-b5dcf9e990445413a77522ab0f352a9f7480cf81.tar.bz2
ice-b5dcf9e990445413a77522ab0f352a9f7480cf81.tar.xz
ice-b5dcf9e990445413a77522ab0f352a9f7480cf81.zip
Bug 3535: Race condition in file system demo
Updated demos to use Matthew's code.
Diffstat (limited to 'java/demo/book/lifecycle/Server.java')
-rw-r--r--java/demo/book/lifecycle/Server.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/java/demo/book/lifecycle/Server.java b/java/demo/book/lifecycle/Server.java
index afa26093a42..6e3286ebafb 100644
--- a/java/demo/book/lifecycle/Server.java
+++ b/java/demo/book/lifecycle/Server.java
@@ -27,15 +27,17 @@ class Server extends Ice.Application
// Create the root directory.
//
DirectoryI root = new DirectoryI();
- root.activate(adapter);
+ Ice.Identity id = new Ice.Identity();
+ id.name = "RootDir";
+ adapter.add(root, id);
// All objects are created, allow client requests now.
//
adapter.activate();
- //
// Wait until we are done.
+ //
communicator().waitForShutdown();
if(interrupted())
{