Merge commit 'origin/R3_3_branch'

Conflicts:
	CHANGES
	cpp/demo/Freeze/backup/.depend
	cpp/demo/Freeze/bench/.depend
	cpp/demo/Freeze/casino/.depend
	cpp/demo/Freeze/customEvictor/.depend
	cpp/demo/Freeze/library/.depend
	cpp/demo/Freeze/phonebook/.depend
	cpp/demo/Freeze/transform/.depend
	cpp/demo/Glacier2/callback/.depend
	cpp/demo/Glacier2/chat/.depend
	cpp/demo/Ice/async/.depend
	cpp/demo/Ice/bidir/.depend
	cpp/demo/Ice/callback/.depend
	cpp/demo/Ice/converter/.depend
	cpp/demo/Ice/hello/.depend
	cpp/demo/Ice/invoke/.depend
	cpp/demo/Ice/latency/.depend
	cpp/demo/Ice/minimal/.depend
	cpp/demo/Ice/multicast/.depend
	cpp/demo/Ice/nested/.depend
	cpp/demo/Ice/nrvo/.depend
	cpp/demo/Ice/session/.depend
	cpp/demo/Ice/throughput/.depend
	cpp/demo/Ice/value/.depend
	cpp/demo/IceBox/hello/.depend
	cpp/demo/IceGrid/allocate/.depend
	cpp/demo/IceGrid/icebox/.depend
	cpp/demo/IceGrid/replication/.depend
	cpp/demo/IceGrid/sessionActivation/.depend
	cpp/demo/IceGrid/simple/.depend
	cpp/demo/IceStorm/clock/.depend
	cpp/demo/IceStorm/counter/.depend
	cpp/demo/IceStorm/replicated/.depend
	cpp/demo/IceStorm/replicated2/.depend
	cpp/demo/book/freeze_filesystem/.depend
	cpp/demo/book/lifecycle/.depend
	cpp/demo/book/printer/.depend
	cpp/demo/book/simple_filesystem/.depend
	cpp/src/Freeze/.depend
	cpp/src/FreezeScript/.depend
	cpp/src/Ice/.depend
	cpp/src/Ice/UdpTransceiver.cpp
	cpp/src/Ice/UdpTransceiver.h
	cpp/src/IceBox/.depend
	cpp/src/IceGrid/.depend
	cpp/src/IceGridLib/.depend
	cpp/src/IcePatch2/.depend
	cpp/src/IceStorm/.depend
	cpp/src/slice2freeze/.depend
	cpp/test/Freeze/complex/.depend
	cpp/test/Freeze/dbmap/.depend
	cpp/test/Freeze/evictor/.depend
	cpp/test/Freeze/oldevictor/.depend
	cpp/test/FreezeScript/dbmap/.depend
	cpp/test/FreezeScript/evictor/.depend
	cpp/test/Glacier2/attack/.depend
	cpp/test/Glacier2/dynamicFiltering/.depend
	cpp/test/Glacier2/router/.depend
	cpp/test/Glacier2/sessionControl/.depend
	cpp/test/Glacier2/ssl/.depend
	cpp/test/Glacier2/staticFiltering/.depend
	cpp/test/Ice/adapterDeactivation/.depend
	cpp/test/Ice/background/.depend
	cpp/test/Ice/binding/.depend
	cpp/test/Ice/checksum/.depend
	cpp/test/Ice/checksum/server/.depend
	cpp/test/Ice/custom/.depend
	cpp/test/Ice/exceptions/.depend
	cpp/test/Ice/facets/.depend
	cpp/test/Ice/faultTolerance/.depend
	cpp/test/Ice/gc/.depend
	cpp/test/Ice/hold/.depend
	cpp/test/Ice/inheritance/.depend
	cpp/test/Ice/interceptor/.depend
	cpp/test/Ice/location/.depend
	cpp/test/Ice/objects/.depend
	cpp/test/Ice/operations/.depend
	cpp/test/Ice/proxy/.depend
	cpp/test/Ice/retry/.depend
	cpp/test/Ice/servantLocator/.depend
	cpp/test/Ice/slicing/exceptions/.depend
	cpp/test/Ice/slicing/objects/.depend
	cpp/test/Ice/stream/.depend
	cpp/test/Ice/stringConverter/.depend
	cpp/test/Ice/timeout/.depend
	cpp/test/Ice/udp/.depend
	cpp/test/IceBox/configuration/.depend
	cpp/test/IceGrid/activation/.depend
	cpp/test/IceGrid/allocation/.depend
	cpp/test/IceGrid/deployer/.depend
	cpp/test/IceGrid/distribution/.depend
	cpp/test/IceGrid/replicaGroup/.depend
	cpp/test/IceGrid/replication/.depend
	cpp/test/IceGrid/session/.depend
	cpp/test/IceGrid/simple/.depend
	cpp/test/IceGrid/update/.depend
	cpp/test/IceSSL/configuration/.depend
	cpp/test/IceStorm/federation/.depend
	cpp/test/IceStorm/federation2/.depend
	cpp/test/IceStorm/rep1/.depend
	cpp/test/IceStorm/repgrid/.depend
	cpp/test/IceStorm/repstress/.depend
	cpp/test/IceStorm/single/.depend
	cpp/test/IceStorm/stress/.depend
	cpp/test/Slice/keyword/.depend
	cs/src/Ice/Instance.cs
	cs/src/IceSSL/ConnectorI.cs
	java/demo/book/simple_filesystem/Filesystem/DirectoryI.java
	java/demo/book/simple_filesystem/Filesystem/FileI.java
	java/src/IceInternal/TcpConnector.java
	java/src/IceSSL/ConnectorI.java
	py/modules/IcePy/.depend
	rb/src/IceRuby/.depend

1 files changed, 62 insertions, 52 deletions

diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index ab41198104c..63fc22a7f11 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -554,74 +554,84 @@ IceInternal::ThreadPool::run()
                     handler->_serializing = false;
                 }
 
-                //
-                // First we reap threads that have been destroyed before.
-                //
-                int sz = static_cast<int>(_threads.size());
-                assert(_running <= sz);
-                if(_running < sz)
+                if(_size < _sizeMax) // Dynamic thread pool
                 {
-                    vector<IceUtil::ThreadPtr>::iterator start =
-                        partition(_threads.begin(), _threads.end(), IceUtil::constMemFun(&IceUtil::Thread::isAlive));
-
-                    for(vector<IceUtil::ThreadPtr>::iterator p = start; p != _threads.end(); ++p)
+                    //
+                    // First we reap threads that have been destroyed before.
+                    //
+                    int sz = static_cast<int>(_threads.size());
+                    assert(_running <= sz);
+                    if(_running < sz)
                     {
-                        (*p)->getThreadControl().join();
-                    }
+                        vector<IceUtil::ThreadPtr>::iterator start =
+                            partition(_threads.begin(), _threads.end(), 
+                                      IceUtil::constMemFun(&IceUtil::Thread::isAlive));
 
-                    _threads.erase(start, _threads.end());
-                }
-                
-                //
-                // Now we check if this thread can be destroyed, based
-                // on a load factor.
-                //
+                        for(vector<IceUtil::ThreadPtr>::iterator p = start; p != _threads.end(); ++p)
+                        {
+                            (*p)->getThreadControl().join();
+                        }
 
-                //
-                // The load factor jumps immediately to the number of
-                // threads that are currently in use, but decays
-                // exponentially if the number of threads in use is
-                // smaller than the load factor. This reflects that we
-                // create threads immediately when they are needed,
-                // but want the number of threads to slowly decline to
-                // the configured minimum.
-                //
-                double inUse = static_cast<double>(_inUse);
-                if(_load < inUse)
-                {
-                    _load = inUse;
-                }
-                else
-                {
-                    const double loadFactor = 0.05; // TODO: Configurable?
-                    const double oneMinusLoadFactor = 1 - loadFactor;
-                    _load = _load * oneMinusLoadFactor + inUse * loadFactor;
-                }
+                        _threads.erase(start, _threads.end());
+                    }
                 
-                if(_running > _size)
-                {
-                    int load = static_cast<int>(_load + 0.5);
+                    //
+                    // Now we check if this thread can be destroyed, based
+                    // on a load factor.
+                    //
 
                     //
-                    // We add one to the load factor because on
-                    // additional thread is needed for select().
+                    // The load factor jumps immediately to the number of
+                    // threads that are currently in use, but decays
+                    // exponentially if the number of threads in use is
+                    // smaller than the load factor. This reflects that we
+                    // create threads immediately when they are needed,
+                    // but want the number of threads to slowly decline to
+                    // the configured minimum.
                     //
-                    if(load + 1 < _running)
+                    double inUse = static_cast<double>(_inUse);
+                    if(_load < inUse)
+                    {
+                        _load = inUse;
+                    }
+                    else
                     {
-                        assert(_inUse > 0);
-                        --_inUse;
+                        const double loadFactor = 0.05; // TODO: Configurable?
+                        const double oneMinusLoadFactor = 1 - loadFactor;
+                        _load = _load * oneMinusLoadFactor + inUse * loadFactor;
+                    }
+                
+                    if(_running > _size)
+                    {
+                        int load = static_cast<int>(_load + 0.5);
+
+                        //
+                        // We add one to the load factor because on
+                        // additional thread is needed for select().
+                        //
+                        if(load + 1 < _running)
+                        {
+                            assert(_inUse > 0);
+                            --_inUse;
                         
-                        assert(_running > 0);
-                        --_running;
+                            assert(_running > 0);
+                            --_running;
                         
-                        return false;
+                            return false;
+                        }
                     }
                 }
-                
+
                 assert(_inUse > 0);
                 --_inUse;
             }
-            
+
+            //
+            // Do not wait to be promoted again to release these objects.
+            //
+            handler = 0;
+            workItem = 0;
+
             while(!_promote)
             {
                 wait();