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

1 files changed, 3 insertions, 4 deletions

diff --git a/cpp/src/Glacier2/ServerBlobject.cpp b/cpp/src/Glacier2/ServerBlobject.cpp
index f528f25ecc9..377a5db830b 100644
--- a/cpp/src/Glacier2/ServerBlobject.cpp
+++ b/cpp/src/Glacier2/ServerBlobject.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.
@@ -14,8 +14,7 @@ using namespace Ice;
 using namespace Glacier2;
 
 Glacier2::ServerBlobject::ServerBlobject(const InstancePtr& instance, const ConnectionPtr& connection) :
-    Glacier2::Blobject(instance, true, Ice::Context()),
-    _connection(connection)
+    Glacier2::Blobject(instance, connection, Ice::Context())
 {
 }
 
@@ -28,7 +27,7 @@ Glacier2::ServerBlobject::ice_invoke_async(const Ice::AMD_Array_Object_ice_invok
                                            const std::pair<const Byte*, const Byte*>& inParams,
                                            const Current& current)
 {
-    ObjectPrx proxy = _connection->createProxy(current.id);
+    ObjectPrx proxy = _reverseConnection->createProxy(current.id);
     assert(proxy);
 
     invoke(proxy, amdCB, inParams, current);