]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[3965] Removed the spurious logic in the CSVLeaseFile6.
authorMarcin Siodelski <marcin@isc.org>
Fri, 28 Aug 2015 15:17:03 +0000 (17:17 +0200)
committerMarcin Siodelski <marcin@isc.org>
Fri, 28 Aug 2015 15:17:03 +0000 (17:17 +0200)
src/lib/dhcpsrv/csv_lease_file6.cc

index 2d0963f4c3077f78c840d2a021e027bde2633ce1..ce1dcb5fa380ba7211897b3adf80cb69ad245d6e 100644 (file)
@@ -229,10 +229,7 @@ CSVLeaseFile6::readHWAddr(const CSVRow& row) {
         // Let's return a pointer to new freshly created copy.
         return (HWAddrPtr(new HWAddr(hwaddr)));
 
-    } catch (const CSVFileError&) {
-        // That's ok, we may be reading old CSV file that didn't store hwaddr
-        return (HWAddrPtr());
-    } catch (const BadValue& ex) {
+    } catch (const std::exception& ex) {
         // That's worse. There was something in the file, but its conversion
         // to HWAddr failed. Let's log it on warning and carry on.
         LOG_WARN(dhcpsrv_logger, DHCPSRV_MEMFILE_READ_HWADDR_FAIL)