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, 173 insertions, 0 deletions

diff --git a/java/src/IceInternal/OutputStreamWrapper.java b/java/src/IceInternal/OutputStreamWrapper.java
new file mode 100644
index 00000000000..471eef7358c
--- /dev/null
+++ b/java/src/IceInternal/OutputStreamWrapper.java
@@ -0,0 +1,173 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+package IceInternal;
+
+import java.io.*;
+
+//
+// Class to provide a java.io.OutputStream on top of a BasicStream.
+// We use this to serialize arbitrary Java serializable classes into
+//
+// Slice sequences are encoded on the wire as a count of elements, followed
+// by the sequence contents. For arbitrary Java classes, we do not know how
+// big the sequence that is eventually written will be. To avoid excessive
+// data copying, this class mantains a private _bytes array of 254 bytes and,
+// initially, writes data into that array. If more than 254 bytes end up being
+// written, we write a dummy sequence size of 255 (which occupies five bytes
+// on the wire) into the BasicStream and, once this stream is closed, patch
+// that size to match the actual size. Otherwise, if the _bytes buffer contains
+// fewer than 255 bytes when this stream is closed, we write the sequence size
+// as a single byte, followed by the contents of the _bytes buffer.
+//
+
+public class OutputStreamWrapper extends java.io.OutputStream
+{
+    public
+    OutputStreamWrapper(BasicStream s)
+    {
+        _s = s;
+        _spos = s.pos();
+        _bytes = new byte[254];
+        _pos = 0;
+    }
+
+    public void
+    write(int b) throws IOException
+    {
+        try
+        {
+            if(_bytes != null)
+            {
+                //
+                // If we can fit the data into the first 254 bytes, write it to _bytes.
+                //
+                if(_pos < _bytes.length)
+                {
+                    _bytes[_pos++] = (byte)b;
+                    return;
+                }
+
+                _s.writeSize(255); // Dummy size, until we know how big the stream
+                                   // really is and can patch the size.
+
+                if(_pos > 0)
+                {
+                    //
+                    // Write the current contents of _bytes.
+                    //
+                    _s.expand(_pos);
+                    _s.getBuffer().b.put(_bytes, 0, _pos);
+                }
+                _bytes = null;
+            }
+
+            //
+            // Write data passed by caller.
+            //
+            _s.expand(1);
+            _s.getBuffer().b.put((byte)b);
+            _pos += 1;
+        }
+        catch(java.lang.Exception ex)
+        {
+            throw new IOException(ex.toString());
+        }
+    }
+
+    public void
+    write(byte[] b) throws IOException
+    {
+        write(b, 0, b.length);
+    }
+
+    public void
+    write(byte[] bytes, int offset, int count) throws IOException
+    {
+        try
+        {
+            if(_bytes != null)
+            {
+                //
+                // If we can fit the data into the first 254 bytes, write it to _bytes.
+                //
+                if(count <= _bytes.length - _pos)
+                {
+                    System.arraycopy(bytes, offset, _bytes, _pos, count);
+                    _pos += count;
+                    return;
+                }
+
+                _s.writeSize(255); // Dummy size, until we know how big the stream
+                                   // really is and can patch the size.
+
+                if(_pos > 0)
+                {
+                    //
+                    // Write the current contents of _bytes.
+                    //
+                    _s.expand(_pos);
+                    _s.getBuffer().b.put(_bytes, 0, _pos);
+                }
+                _bytes = null;
+            }
+
+            //
+            // Write data passed by caller.
+            //
+            _s.expand(count);
+            _s.getBuffer().b.put(bytes, offset, count);
+            _pos += count;
+        }
+        catch(java.lang.Exception ex)
+        {
+            throw new IOException(ex.toString());
+        }
+    }
+
+    public void
+    flush() throws IOException
+    {
+        // This does nothing because we do not know the final size of a writable stream until it is closed,
+        // and we cannot write to the BasicStream until we know whether the final size is < 255 or not.
+    }
+
+    public void
+    close() throws IOException
+    {
+        try
+        {
+            if(_bytes != null)
+            {
+                assert(_pos <= _bytes.length);
+                _s.pos(_spos);
+                _s.writeSize(_pos);
+                _s.expand(_pos);
+                _s.getBuffer().b.put(_bytes, 0, _pos);
+                _bytes = null;
+            }
+            else
+            {
+                int currentPos = _s.pos();
+                _s.pos(_spos);
+                _s.writeSize(_pos); // Patch previously-written dummy value.
+                _s.pos(currentPos);
+            }
+        }
+        catch(java.lang.Exception ex)
+        {
+            throw new IOException(ex.toString());
+        }
+    }
+
+    private BasicStream _s;
+    private int _spos;
+    private byte[] _bytes;
+    private int _pos;
+}