diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-01-28 08:21:22 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-01-28 08:21:22 +0000 |
| commit | ff30351289b99a7b038722db12abdf1d3fac8091 (patch) | |
| tree | 8740b808fb7206106ae09f2729cc36f222784245 /java/src/Ice/ObjectAdapterI.java | |
| parent | The object adapter thread pool is not created anymore if thread per (diff) | |
| download | ice-ff30351289b99a7b038722db12abdf1d3fac8091.tar.bz2 ice-ff30351289b99a7b038722db12abdf1d3fac8091.tar.xz ice-ff30351289b99a7b038722db12abdf1d3fac8091.zip | |
The object adapter thread pool isn't created anymore if thread per
connection is enabled.
Added more exception and error handling to the IncomingConnectionFactory.
Fixed a bug where the wrong thread pool was used for the
IncomingConnectionFactory.
Diffstat (limited to 'java/src/Ice/ObjectAdapterI.java')
| -rw-r--r-- | java/src/Ice/ObjectAdapterI.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index 37089faf1f8..1e7aaaf1fb7 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -713,11 +713,14 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt setLocator(_instance.referenceFactory().getDefaultLocator()); } - int size = _instance.properties().getPropertyAsInt(_name + ".ThreadPool.Size"); - int sizeMax = _instance.properties().getPropertyAsInt(_name + ".ThreadPool.SizeMax"); - if(size > 0 || sizeMax > 0) + if(!_instance.threadPerConnection()) { - _threadPool = new IceInternal.ThreadPool(_instance, _name + ".ThreadPool", 0); + int size = _instance.properties().getPropertyAsInt(_name + ".ThreadPool.Size"); + int sizeMax = _instance.properties().getPropertyAsInt(_name + ".ThreadPool.SizeMax"); + if(size > 0 || sizeMax > 0) + { + _threadPool = new IceInternal.ThreadPool(_instance, _name + ".ThreadPool", 0); + } } } catch(LocalException ex) |