diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2010-01-11 12:41:54 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2010-01-11 12:41:54 +0100 |
| commit | eb94b29454a2e8d2ce459fe23f7205a0a1fe9ae7 (patch) | |
| tree | ec18df62f959596da3e47049494f730fd6741b9b | |
| parent | Fixed bug 4596 -- test/Ice/operations cross language tests failing (diff) | |
| download | ice-eb94b29454a2e8d2ce459fe23f7205a0a1fe9ae7.tar.bz2 ice-eb94b29454a2e8d2ce459fe23f7205a0a1fe9ae7.tar.xz ice-eb94b29454a2e8d2ce459fe23f7205a0a1fe9ae7.zip | |
- Fixed bug 4594, bumped IceGrid.Node.WaitTime to prevent timeouts on slow VMs
- Fixed bug 4602: added comment in Stream.h
| -rw-r--r-- | cpp/include/Ice/Stream.h | 4 | ||||
| -rw-r--r-- | scripts/IceGridAdmin.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h index 9dc7a16d87e..b9e94e46288 100644 --- a/cpp/include/Ice/Stream.h +++ b/cpp/include/Ice/Stream.h @@ -332,7 +332,7 @@ public: virtual void read(Float&) = 0; virtual void read(Double&) = 0; virtual void read(std::string&, bool = true) = 0; - virtual void read(std::vector<std::string>&, bool) = 0; + virtual void read(std::vector<std::string>&, bool) = 0; // Overload required for additional bool argument. virtual void read(std::wstring&) = 0; virtual void read(std::pair<const bool*, const bool*>&, ::IceUtil::ScopedArray<bool>&) = 0; @@ -442,7 +442,7 @@ public: virtual void write(Float) = 0; virtual void write(Double) = 0; virtual void write(const std::string&, bool = true) = 0; - virtual void write(const std::vector<std::string>&, bool) = 0; + virtual void write(const std::vector<std::string>&, bool) = 0; // Overload required for additional bool argument. virtual void write(const char* v, bool = true) = 0; virtual void write(const std::wstring& v) = 0; diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index b64b8849833..d67c547000a 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -21,7 +21,7 @@ iceGridPort = 12010; nodeOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Node.Endpoints=default' + \ - r' --IceGrid.Node.WaitTime=30' + \ + r' --IceGrid.Node.WaitTime=240' + \ r' --Ice.ProgramName=icegridnode' + \ r' --IceGrid.Node.Trace.Replica=0' + \ r' --IceGrid.Node.Trace.Activator=0' + \ |