summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/ObjectAdapterI.java5
-rw-r--r--java/src/IceInternal/ThreadPool.java2
2 files changed, 3 insertions, 4 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 0122210a691..448a8c7795e 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -615,8 +615,9 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
setLocator(_instance.referenceFactory().getDefaultLocator());
}
- int threadNum = _instance.properties().getPropertyAsInt(_name + ".ThreadPool.Size");
- if(threadNum > 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);
}
diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java
index 60cc322be4a..c00a93f9856 100644
--- a/java/src/IceInternal/ThreadPool.java
+++ b/java/src/IceInternal/ThreadPool.java
@@ -72,7 +72,6 @@ public final class ThreadPool
if(size < 1)
{
size = 1;
- _instance.properties().setProperty(_prefix + ".Size", "" + size);
}
_size = size;
@@ -80,7 +79,6 @@ public final class ThreadPool
if(sizeMax < _size)
{
sizeMax = _size;
- _instance.properties().setProperty(_prefix + ".SizeMax", "" + sizeMax);
}
_sizeMax = sizeMax;