summaryrefslogtreecommitdiff
path: root/java/src/Ice/ObjectAdapterI.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2008-03-07 14:22:07 +0100
committerBenoit Foucher <benoit@zeroc.com>2008-03-07 14:22:07 +0100
commit900068c37f733cb091c8c5318b2e0e887f0f0da0 (patch)
tree78cc180b10b70da06fb142af4d39338b67bb09c2 /java/src/Ice/ObjectAdapterI.java
parentMerge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff)
downloadice-900068c37f733cb091c8c5318b2e0e887f0f0da0.tar.bz2
ice-900068c37f733cb091c8c5318b2e0e887f0f0da0.tar.xz
ice-900068c37f733cb091c8c5318b2e0e887f0f0da0.zip
Added tests for serialize mode, fixed bug in ConnectionI::finished
Diffstat (limited to 'java/src/Ice/ObjectAdapterI.java')
-rw-r--r--java/src/Ice/ObjectAdapterI.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 9459d4bdb6a..5c6d7755cf1 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -1355,7 +1355,8 @@ public final class ObjectAdapterI implements ObjectAdapter
"ThreadPool.Size",
"ThreadPool.SizeMax",
"ThreadPool.SizeWarn",
- "ThreadPool.StackSize"
+ "ThreadPool.StackSize",
+ "ThreadPool.Serialize"
};
boolean