BIND 10 trac2850_2, updated. 5d65c74c127243790200028375786fced2bd1ad7 [2850] Throw isc::InvalidOperation instead of isc::Unexpected
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri May 3 01:22:51 UTC 2013
The branch, trac2850_2 has been updated
via 5d65c74c127243790200028375786fced2bd1ad7 (commit)
from 2b96d4487c517ab209a1ca5fce4af877fecae0a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5d65c74c127243790200028375786fced2bd1ad7
Author: Mukund Sivaraman <muks at isc.org>
Date: Fri May 3 06:50:00 2013 +0530
[2850] Throw isc::InvalidOperation instead of isc::Unexpected
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/memory/zone_table_segment.h | 12 ++++++++++++
.../datasrc/memory/zone_table_segment_mapped.cc | 6 +++---
src/lib/datasrc/memory/zone_table_segment_mapped.h | 6 +++---
.../memory/zone_table_segment_mapped_unittest.cc | 16 ++++++++--------
4 files changed, 26 insertions(+), 14 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/zone_table_segment.h b/src/lib/datasrc/memory/zone_table_segment.h
index f2be970..c6ab85b 100644
--- a/src/lib/datasrc/memory/zone_table_segment.h
+++ b/src/lib/datasrc/memory/zone_table_segment.h
@@ -96,12 +96,24 @@ public:
virtual ~ZoneTableSegment() {}
/// \brief Return the ZoneTableHeader for the zone table segment.
+ ///
+ /// \throw isc::InvalidOperation may be thrown by some
+ /// implementations if this method is called without calling
+ /// \c reset() successfully first.
virtual ZoneTableHeader& getHeader() = 0;
/// \brief const version of \c getHeader().
+ ///
+ /// \throw isc::InvalidOperation may be thrown by some
+ /// implementations if this method is called without calling
+ /// \c reset() successfully first.
virtual const ZoneTableHeader& getHeader() const = 0;
/// \brief Return the MemorySegment for the zone table segment.
+ ///
+ /// \throw isc::InvalidOperation may be thrown by some
+ /// implementations if this method is called without calling
+ /// \c reset() successfully first.
virtual isc::util::MemorySegment& getMemorySegment() = 0;
/// \brief Return true if the segment is writable.
diff --git a/src/lib/datasrc/memory/zone_table_segment_mapped.cc b/src/lib/datasrc/memory/zone_table_segment_mapped.cc
index 51ce9e9..7cd5e24 100644
--- a/src/lib/datasrc/memory/zone_table_segment_mapped.cc
+++ b/src/lib/datasrc/memory/zone_table_segment_mapped.cc
@@ -195,7 +195,7 @@ ZoneTableSegmentMapped::reset(MemorySegmentOpenMode mode,
ZoneTableHeader&
ZoneTableSegmentMapped::getHeader() {
if (!mem_sgmt_) {
- isc_throw(isc::Unexpected,
+ isc_throw(isc::InvalidOperation,
"getHeader() called without calling reset() first");
}
return (*header_);
@@ -204,7 +204,7 @@ ZoneTableSegmentMapped::getHeader() {
const ZoneTableHeader&
ZoneTableSegmentMapped::getHeader() const {
if (!mem_sgmt_) {
- isc_throw(isc::Unexpected,
+ isc_throw(isc::InvalidOperation,
"getHeader() called without calling reset() first");
}
return (*header_);
@@ -213,7 +213,7 @@ ZoneTableSegmentMapped::getHeader() const {
MemorySegment&
ZoneTableSegmentMapped::getMemorySegment() {
if (!mem_sgmt_) {
- isc_throw(isc::Unexpected,
+ isc_throw(isc::InvalidOperation,
"getMemorySegment() called without calling reset() first");
}
return (*mem_sgmt_);
diff --git a/src/lib/datasrc/memory/zone_table_segment_mapped.h b/src/lib/datasrc/memory/zone_table_segment_mapped.h
index 5e37a81..17cbf91 100644
--- a/src/lib/datasrc/memory/zone_table_segment_mapped.h
+++ b/src/lib/datasrc/memory/zone_table_segment_mapped.h
@@ -46,20 +46,20 @@ public:
/// \brief Return the ZoneTableHeader for the mapped zone table
/// segment implementation.
///
- /// \throws isc::Unexpected if this method is called without a
+ /// \throws isc::InvalidOperation if this method is called without a
/// successful \c reset() call first.
virtual ZoneTableHeader& getHeader();
/// \brief const version of \c getHeader().
///
- /// \throws isc::Unexpected if this method is called without a
+ /// \throws isc::InvalidOperation if this method is called without a
/// successful \c reset() call first.
virtual const ZoneTableHeader& getHeader() const;
/// \brief Return the MemorySegment for the memory-mapped zone table
/// segment implementation (a MemorySegmentMapped instance).
///
- /// \throws isc::Unexpected if this method is called without a
+ /// \throws isc::InvalidOperation if this method is called without a
/// successful \c reset() call first.
virtual isc::util::MemorySegment& getMemorySegment();
diff --git a/src/lib/datasrc/tests/memory/zone_table_segment_mapped_unittest.cc b/src/lib/datasrc/tests/memory/zone_table_segment_mapped_unittest.cc
index 388cf4e..ff8445a 100644
--- a/src/lib/datasrc/tests/memory/zone_table_segment_mapped_unittest.cc
+++ b/src/lib/datasrc/tests/memory/zone_table_segment_mapped_unittest.cc
@@ -60,12 +60,12 @@ protected:
TEST_F(ZoneTableSegmentMappedTest, getHeaderUninitialized) {
// This should throw as we haven't called reset() yet.
- EXPECT_THROW(ztable_segment_->getHeader(), isc::Unexpected);
+ EXPECT_THROW(ztable_segment_->getHeader(), isc::InvalidOperation);
}
TEST_F(ZoneTableSegmentMappedTest, getMemorySegmentUninitialized) {
// This should throw as we haven't called reset() yet.
- EXPECT_THROW(ztable_segment_->getMemorySegment(), isc::Unexpected);
+ EXPECT_THROW(ztable_segment_->getMemorySegment(), isc::InvalidOperation);
}
TEST_F(ZoneTableSegmentMappedTest, isWritableUninitialized) {
@@ -100,8 +100,8 @@ TEST_F(ZoneTableSegmentMappedTest, resetBadConfig) {
}, isc::InvalidParameter);
// The following should still throw, unaffected by the failed opens.
- EXPECT_THROW(ztable_segment_->getHeader(), isc::Unexpected);
- EXPECT_THROW(ztable_segment_->getMemorySegment(), isc::Unexpected);
+ EXPECT_THROW(ztable_segment_->getHeader(), isc::InvalidOperation);
+ EXPECT_THROW(ztable_segment_->getMemorySegment(), isc::InvalidOperation);
// isWritable() must still return false, because the segment has not
// been successfully reset() yet.
@@ -117,8 +117,8 @@ TEST_F(ZoneTableSegmentMappedTest, reset) {
}, MemorySegmentOpenError);
// The following should still throw, unaffected by the failed open.
- EXPECT_THROW(ztable_segment_->getHeader(), isc::Unexpected);
- EXPECT_THROW(ztable_segment_->getMemorySegment(), isc::Unexpected);
+ EXPECT_THROW(ztable_segment_->getHeader(), isc::InvalidOperation);
+ EXPECT_THROW(ztable_segment_->getMemorySegment(), isc::InvalidOperation);
// isWritable() must still return false, because the segment has not
// been successfully reset() yet.
@@ -155,8 +155,8 @@ TEST_F(ZoneTableSegmentMappedTest, reset) {
Element::fromJSON("{}"));
}, isc::InvalidParameter);
// The following should throw now.
- EXPECT_THROW(ztable_segment_->getHeader(), isc::Unexpected);
- EXPECT_THROW(ztable_segment_->getMemorySegment(), isc::Unexpected);
+ EXPECT_THROW(ztable_segment_->getHeader(), isc::InvalidOperation);
+ EXPECT_THROW(ztable_segment_->getMemorySegment(), isc::InvalidOperation);
// isWritable() must return false, because the last reset() failed.
EXPECT_FALSE(ztable_segment_->isWritable());
More information about the bind10-changes
mailing list