3 files changed, 10 insertions, 3 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES
index 36ba9f37abd..6a301a30692 100644
--- a/cpp/CHANGES
+++ b/cpp/CHANGES
@@ -1,6 +1,8 @@
 Changes since version 2.1.2
 ---------------------------
 
+- Fixed a bug in proxyToString() for bidirectional proxies.
+
 - Added ice_communicator() to proxies. This function returns
   the communicator that was used to create the proxy.
 
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index ceb0e996961..3c714335291 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -501,9 +501,13 @@ IceInternal::FixedReference::changeTimeout(int) const
 void
 IceInternal::FixedReference::streamWrite(BasicStream* s) const
 {
-    MarshalException ex(__FILE__, __LINE__);
-    ex.reason = "Cannot marshal a fixed reference";
-    throw ex;
+    throw MarshalException(__FILE__, __LINE__, "Cannot marshal a fixed reference");
+}
+
+string
+IceInternal::FixedReference::toString() const
+{
+    throw MarshalException(__FILE__, __LINE__, "Cannot marshal a fixed reference");
 }
 
 ConnectionIPtr
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index a37b94daf78..0ae8838dc2a 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -143,6 +143,7 @@ public:
     virtual ReferencePtr changeTimeout(int) const;
 
     virtual void streamWrite(BasicStream*) const;
+    virtual std::string toString() const;
 
     virtual Ice::ConnectionIPtr getConnection(bool&) const;