diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-09-07 11:19:34 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-09-07 11:19:34 -0400 |
| commit | c9c426efd3e579d0220fbdee4a0a261fa2c191b5 (patch) | |
| tree | d67c6356bfda2700e983586afaa71f28734c2cc9 /cpp/src/IceGrid/AdminI.cpp | |
| parent | Undo pragma-once-in-header enhancement (diff) | |
| download | ice-c9c426efd3e579d0220fbdee4a0a261fa2c191b5.tar.bz2 ice-c9c426efd3e579d0220fbdee4a0a261fa2c191b5.tar.xz ice-c9c426efd3e579d0220fbdee4a0a261fa2c191b5.zip | |
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
Diffstat (limited to 'cpp/src/IceGrid/AdminI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/AdminI.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index 7453a93902b..f65f0a26cce 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -810,12 +810,14 @@ AdminI::getNodeProcessorSocketCount(const string& name, const Current&) const catch(const Ice::ObjectNotExistException&) { throw NodeNotExistException(name); + return 0; } catch(const Ice::LocalException& ex) { ostringstream os; os << ex; throw NodeUnreachableException(name, os.str()); + return 0; } } |