diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-30 11:15:13 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-30 11:15:13 +0100 |
| commit | e2c71e58894c929574e9f3fe1a53aba6c2d8e32d (patch) | |
| tree | ab6a8a958acae5910fa3f63f63b6bac5f9821b4e /cpp/src/Ice/ObjectAdapterI.h | |
| parent | SLES fixes (diff) | |
| download | ice-e2c71e58894c929574e9f3fe1a53aba6c2d8e32d.tar.bz2 ice-e2c71e58894c929574e9f3fe1a53aba6c2d8e32d.tar.xz ice-e2c71e58894c929574e9f3fe1a53aba6c2d8e32d.zip | |
Fixed ICE-5728: ObjectAdapter::destroy is now thread safe
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.h')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index 30f499d96c0..a1f8711c068 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -120,10 +120,11 @@ private: { StateUninitialized, StateHeld, - StateWaitActivate, + StateActivating, StateActive, StateDeactivating, StateDeactivated, + StateDestroying, StateDestroyed }; State _state; |