Commit 7d1a2ca8 authored by Mukund Sivaraman's avatar Mukund Sivaraman
Browse files

[2850] Don't use the term "load" when describing what reset() does

parent ad233427
...@@ -198,24 +198,23 @@ public: ...@@ -198,24 +198,23 @@ public:
READ_ONLY READ_ONLY
}; };
/// \brief Unload the current memory store (if loaded) and load the /// \brief Close the current memory store (if open) and open the
/// specified one. /// specified one.
/// ///
/// In case opening/loading the new memory store fails for some /// In case opening the new memory store fails for some reason, one
/// reason, one of the following documented (further below) /// of the following documented (further below) exceptions may be
/// exceptions may be thrown. In case failures occur, /// thrown. In case failures occur, implementations of this method
/// implementations of this method must strictly provide the /// must strictly provide the associated behavior as follows, and in
/// associated behavior as follows, and in the exception /// the exception documentation below. Code that uses
/// documentation below. Code that uses \c ZoneTableSegment would /// \c ZoneTableSegment would depend on such assurances.
/// depend on such assurances.
/// ///
/// In case an existing memory store is in use, and an attempt to /// In case an existing memory store is in use, and an attempt to
/// load a different memory store fails, the existing memory store /// open a different memory store fails, the existing memory store
/// must still be available and the \c ResetFailed exception must be /// must still be available and the \c ResetFailed exception must be
/// thrown. In this case, the segment is still usable. /// thrown. In this case, the segment is still usable.
/// ///
/// In case an existing memory store is in use, and an attempt is /// In case an existing memory store is in use, and an attempt is
/// made to reload the same memory store which results in a failure, /// made to reopen the same memory store which results in a failure,
/// the existing memory store must no longer be available and the /// the existing memory store must no longer be available and the
/// \c ResetFailedAndSegmentCleared exception must be thrown. In /// \c ResetFailedAndSegmentCleared exception must be thrown. In
/// this case, the segment is no longer usable without a further /// this case, the segment is no longer usable without a further
...@@ -233,13 +232,13 @@ public: ...@@ -233,13 +232,13 @@ public:
/// has incorrect syntax, but the segment is still usable due to the /// has incorrect syntax, but the segment is still usable due to the
/// old memory store still being in use. /// old memory store still being in use.
/// ///
/// \throw ResetFailed if there was a problem in loading the new /// \throw ResetFailed if there was a problem in opening the new
/// memory store, but the segment is still usable due to the old /// memory store, but the segment is still usable due to the old
/// memory store still being in use. /// memory store still being in use.
/// ///
/// \throw ResetFailedAndSegmentCleared if there was a problem in /// \throw ResetFailedAndSegmentCleared if there was a problem in
/// loading the new memory store, but the old memory store was also /// opening the new memory store, but the old memory store was also
/// unloaded and is no longer in use. The segment is not usable /// closed and is no longer in use. The segment is not usable
/// without a further successful \c reset(). /// without a further successful \c reset().
/// ///
/// \param mode The open mode (see the MemorySegmentOpenMode /// \param mode The open mode (see the MemorySegmentOpenMode
...@@ -249,9 +248,9 @@ public: ...@@ -249,9 +248,9 @@ public:
virtual void reset(MemorySegmentOpenMode mode, virtual void reset(MemorySegmentOpenMode mode,
isc::data::ConstElementPtr params) = 0; isc::data::ConstElementPtr params) = 0;
/// \brief Unload the current memory store (if loaded). /// \brief Close the current memory store (if open).
/// ///
/// Implementations of this method should unload any current memory /// Implementations of this method should close any current memory
/// store and reset the `ZoneTableSegment` to a freshly constructed /// store and reset the `ZoneTableSegment` to a freshly constructed
/// state. /// state.
/// ///
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment