From: Francis Dupont <fdupont@isc.org>
Date: Tue, 16 Jun 2015 21:59:18 +0000 (+0200)
Subject: [3899] Moved checkType() first in addPool()
X-Git-Tag: trac3919_base~6^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=474450807173d1ea7ce28215d3307b6a1db8732b;p=thirdparty%2Fkea.git

[3899] Moved checkType() first in addPool()
---

diff --git a/src/lib/dhcpsrv/subnet.cc b/src/lib/dhcpsrv/subnet.cc
index dea49fc452..f4d5c3ec9d 100644
--- a/src/lib/dhcpsrv/subnet.cc
+++ b/src/lib/dhcpsrv/subnet.cc
@@ -262,6 +262,9 @@ const PoolPtr Subnet::getPool(Lease::Type type, const isc::asiolink::IOAddress&
 
 void
 Subnet::addPool(const PoolPtr& pool) {
+    // check if the type is valid (and throw if it isn't)
+    checkType(pool->getType());
+
     // Check that the pool is in range with a subnet only if this is
     // not a pool of IPv6 prefixes. The IPv6 prefixes delegated for
     // the particular subnet don't need to match the prefix of the
@@ -281,9 +284,6 @@ Subnet::addPool(const PoolPtr& pool) {
 
     /// @todo: Check that pools do not overlap
 
-    // check if the type is valid (and throw if it isn't)
-    checkType(pool->getType());
-
     // Add the pool to the appropriate pools collection
     getPoolsWritable(pool->getType()).push_back(pool);
 }