diff options
| author | Bernard Normier <bernard@zeroc.com> | 2009-01-23 17:07:21 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2009-01-23 17:07:21 -0500 |
| commit | 2380e089401d048490da23bc6d71e5687bafbe47 (patch) | |
| tree | 6d97052d1f93bc2bafcd7fd1a9ebe103544b6cad /cpp/src/Ice/StreamI.cpp | |
| parent | Fixed permissions (diff) | |
| parent | 3.3.1 third-party updates (diff) | |
| download | ice-2380e089401d048490da23bc6d71e5687bafbe47.tar.bz2 ice-2380e089401d048490da23bc6d71e5687bafbe47.tar.xz ice-2380e089401d048490da23bc6d71e5687bafbe47.zip | |
Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch
Conflicts:
java/resources/IceGridAdmin/icegridadmin_content_dyn.html
java/resources/IceGridAdmin/icegridadmin_content_static.html
Diffstat (limited to 'cpp/src/Ice/StreamI.cpp')
| -rw-r--r-- | cpp/src/Ice/StreamI.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp index 26ecc8acb19..f992b99b76f 100644 --- a/cpp/src/Ice/StreamI.cpp +++ b/cpp/src/Ice/StreamI.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2009 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. @@ -698,7 +698,14 @@ Ice::UserExceptionWriter::~UserExceptionWriter() throw() void Ice::UserExceptionWriter::__write(BasicStream* os) const { - OutputStreamPtr stream = new OutputStreamI(_communicator, os); + OutputStreamI* stream = reinterpret_cast<OutputStreamI*>(os->closure()); + if(!stream) + { + // + // Required for IcePy usage + // + stream = new OutputStreamI(_communicator, os); + } write(stream); } |