diff options
| author | Marc Laukien <marc@zeroc.com> | 2004-10-05 23:22:54 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2004-10-05 23:22:54 +0000 |
| commit | 61ab43118e1636d3867e3032ff131dfc8993361a (patch) | |
| tree | a6c4a65dd20c17a8df0988b42e4f4e9cda49b57f /cpp | |
| parent | fix (diff) | |
| download | ice-61ab43118e1636d3867e3032ff131dfc8993361a.tar.bz2 ice-61ab43118e1636d3867e3032ff131dfc8993361a.tar.xz ice-61ab43118e1636d3867e3032ff131dfc8993361a.zip | |
fixes
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/demo/Glacier2/callback/config.glacier2 | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertiesI.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cpp/demo/Glacier2/callback/config.glacier2 b/cpp/demo/Glacier2/callback/config.glacier2 index 07f0067a060..f55fc9e5f41 100644 --- a/cpp/demo/Glacier2/callback/config.glacier2 +++ b/cpp/demo/Glacier2/callback/config.glacier2 @@ -34,7 +34,7 @@ Glacier2.PermissionsVerifier=verifier:tcp -h 127.0.0.1 -p 10001 Glacier2.SessionTimeout=30 # -# These two lines instruct Glacier to forward contexts both for +# These two lines instruct Glacier2 to forward contexts both for # regular routing, as well as for callbacks (reverse routing). # Glacier2.Client.ForwardContext=1 diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp index 411189f20c4..b1af4fe9433 100644 --- a/cpp/src/Ice/PropertiesI.cpp +++ b/cpp/src/Ice/PropertiesI.cpp @@ -326,6 +326,9 @@ static const string glacier2Props[] = "Client.Endpoints", "Client.ForwardContext", "Client.SleepTime", + "Client.ThreadPool.Size", + "Client.ThreadPool.SizeMax", + "Client.ThreadPool.SizeWarn", "Client.Trace.Override", "Client.Trace.Reject", "Client.Trace.Request", @@ -335,6 +338,9 @@ static const string glacier2Props[] = "Server.Endpoints", "Server.ForwardContext", "Server.SleepTime", + "Server.ThreadPool.Size", + "Server.ThreadPool.SizeMax", + "Server.ThreadPool.SizeWarn", "Server.Trace.Override", "Server.Trace.Request", "SessionManager", |