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, 70 insertions, 72 deletions

diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java
index ea80b046a77..4a84278ab6c 100644
--- a/java/src/IceInternal/ThreadPool.java
+++ b/java/src/IceInternal/ThreadPool.java
@@ -524,7 +524,6 @@ public final class ThreadPool
                             }
                             catch(Ice.DatagramLimitException ex) // Expected.
                             {
-                                handler._stream.pos(0);
                                 handler._stream.resize(0, true);
                                 continue;
                             }
@@ -550,7 +549,6 @@ public final class ThreadPool
                                         _instance.initializationData().logger.warning(
                                             "datagram connection exception:\n" + ex + "\n" + handler.toString());
                                     }
-                                    handler._stream.pos(0);
                                     handler._stream.resize(0, true);
                                 }
                                 else
@@ -618,83 +616,93 @@ public final class ThreadPool
                             handler._serializing = false;
                         }
 
-                        //
-                        // First we reap threads that have been
-                        // destroyed before.
-                        //
-                        int sz = _threads.size();
-                        assert(_running <= sz);
-                        if(_running < sz)
+
+                        if(_size < _sizeMax) // Dynamic thread pool
                         {
-                            java.util.Iterator<EventHandlerThread> i = _threads.iterator();
-                            while(i.hasNext())
+                            //
+                            // First we reap threads that have been
+                            // destroyed before.
+                            //
+                            int sz = _threads.size();
+                            assert(_running <= sz);
+                            if(_running < sz)
                             {
-                                EventHandlerThread thread = i.next();
-
-                                if(!thread.isAlive())
+                                java.util.Iterator<EventHandlerThread> i = _threads.iterator();
+                                while(i.hasNext())
                                 {
-                                    try
-                                    {
-                                        thread.join();
-                                        i.remove();
-                                    }
-                                    catch(InterruptedException ex)
+                                    EventHandlerThread thread = i.next();
+
+                                    if(!thread.isAlive())
                                     {
+                                        try
+                                        {
+                                            thread.join();
+                                            i.remove();
+                                        }
+                                        catch(InterruptedException ex)
+                                        {
+                                        }
                                     }
                                 }
                             }
-                        }
                         
-                        //
-                        // Now we check if this thread can be destroyed, based
-                        // on a load factor.
-                        //
-
-                        //
-                        // 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 = (double)_inUse;
-                        if(_load < inUse)
-                        {
-                            _load = inUse;
-                        }
-                        else
-                        {
-                            final double loadFactor = 0.05; // TODO: Configurable?
-                            final double oneMinusLoadFactor = 1 - loadFactor;
-                            _load = _load * oneMinusLoadFactor + _inUse * loadFactor;
-                        }
-
-                        if(_running > _size)
-                        {
-                            int load = (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 one
-                            // 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 = (double)_inUse;
+                            if(_load < inUse)
                             {
-                                assert(_inUse > 0);
-                                --_inUse;
+                                _load = inUse;
+                            }
+                            else
+                            {
+                                final double loadFactor = 0.05; // TODO: Configurable?
+                                final double oneMinusLoadFactor = 1 - loadFactor;
+                                _load = _load * oneMinusLoadFactor + _inUse * loadFactor;
+                            }
+
+                            if(_running > _size)
+                            {
+                                int load = (int)(_load + 0.5);
+
+                                //
+                                // We add one to the load factor because one
+                                // 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 = null;
+                    workItem = null;
+
                     while(!_promote)
                     {
                         try
@@ -793,8 +801,8 @@ public final class ThreadPool
             throw e;
         }
 
-        byte messageType = stream.readByte();
-        byte compress = stream.readByte();
+        stream.readByte(); // messageType
+        stream.readByte(); // compress
         int size = stream.readInt();
         if(size < Protocol.headerSize)
         {
@@ -962,23 +970,13 @@ public final class ThreadPool
             {
                 promote = ThreadPool.this.run(stream);
             }
-            catch(Ice.LocalException ex)
-            {
-                java.io.StringWriter sw = new java.io.StringWriter();
-                java.io.PrintWriter pw = new java.io.PrintWriter(sw);
-                ex.printStackTrace(pw);
-                pw.flush();
-                String s = "exception in `" + _prefix + "' thread " + getName() + ":\n" + sw.toString();
-                _instance.initializationData().logger.error(s);
-                promote = true;
-            }
             catch(java.lang.Exception ex)
             {
                 java.io.StringWriter sw = new java.io.StringWriter();
                 java.io.PrintWriter pw = new java.io.PrintWriter(sw);
                 ex.printStackTrace(pw);
                 pw.flush();
-                String s = "unknown exception in `" + _prefix + "' thread " + getName() + ":\n" + sw.toString();
+                String s = "exception in `" + _prefix + "' thread " + getName() + ":\n" + sw.toString();
                 _instance.initializationData().logger.error(s);
                 promote = true;
             }