diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-07-26 09:09:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-07-26 09:09:03 +0200 |
| commit | 1e6a694714985125f37bf67dc5d35fd76fc7a33f (patch) | |
| tree | 92dbf46286fcd8d02010b00093907511be8ab08d /cpp/src/Ice/Selector.cpp | |
| parent | ICE-5313 - more fixes for checksums (diff) | |
| download | ice-1e6a694714985125f37bf67dc5d35fd76fc7a33f.tar.bz2 ice-1e6a694714985125f37bf67dc5d35fd76fc7a33f.tar.xz ice-1e6a694714985125f37bf67dc5d35fd76fc7a33f.zip | |
Revert "Fix to allow transceivers to read more data than requested."
This reverts commit 9c4e79ce6760badf047568fd300fcbe3455f31b7.
Diffstat (limited to 'cpp/src/Ice/Selector.cpp')
| -rw-r--r-- | cpp/src/Ice/Selector.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp index 48de01df197..c9763d6e2a9 100644 --- a/cpp/src/Ice/Selector.cpp +++ b/cpp/src/Ice/Selector.cpp @@ -140,7 +140,6 @@ Selector::initialize(EventHandler* handler) throw ex; } handler->__incRef(); - handler->getNativeInfo()->initialize(_handle, reinterpret_cast<ULONG_PTR>(handler)); } void @@ -483,6 +482,7 @@ Selector::select(vector<pair<EventHandler*, SocketOperation> >& handlers, int ti } assert(ret > 0); + handlers.clear(); for(int i = 0; i < ret; ++i) { pair<EventHandler*, SocketOperation> p; @@ -701,6 +701,7 @@ Selector::select(vector<pair<EventHandler*, SocketOperation> >& handlers, int ti } assert(ret > 0); + handlers.clear(); #if defined(ICE_USE_SELECT) if(_selectedReadFdSet.fd_count == 0 && _selectedWriteFdSet.fd_count == 0 && _selectedErrorFdSet.fd_count == 0) |