Port to Solaris 11 / Solaris Studio 12.3 (== CC 5.12)

Fix to BasicStream.h (unitialized data member) that caused occasional failures in Ice/stream test

1 files changed, 3 insertions, 0 deletions

diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp
index 501af30ab80..25aeaffe85a 100644
--- a/cpp/src/IceGrid/AdminSessionI.cpp
+++ b/cpp/src/IceGrid/AdminSessionI.cpp
@@ -238,6 +238,7 @@ AdminSessionI::openServerLog(const string& id, const string& path, int nLines, c
     catch(const SynchronizationException&)
     {
         throw DeploymentException("server is being updated");
+        return 0;
     }
 }
 
@@ -251,6 +252,7 @@ AdminSessionI::openServerStdOut(const string& id, int nLines, const Ice::Current
     catch(const SynchronizationException&)
     {
         throw DeploymentException("server is being updated");
+        return 0;
     }
 }
 
@@ -264,6 +266,7 @@ AdminSessionI::openServerStdErr(const string& id, int nLines, const Ice::Current
     catch(const SynchronizationException&)
     {
         throw DeploymentException("server is being updated");
+        return 0;
     }
 }