From 7ae5e4657d19c2991c208fdcc5d8e46633b23559 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 1 Feb 2016 18:43:47 -0500 Subject: [PATCH] Column: Only fail when an invalid UDA type is found - Previously it was failing for a missing type, so that if a UDA was not completely defined, there was an unexpected error. This is because the setting uda.foo.label was enough to make Column extract 'foo', but then fail to extract uda.foo.type. --- src/columns/Column.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp index 5dbc00715..d2644cb41 100644 --- a/src/columns/Column.cpp +++ b/src/columns/Column.cpp @@ -216,8 +216,9 @@ Column* Column::uda (const std::string& name) split (c->_values, values, ','); return c; } + else if (type != "") + throw std::string (STRING_UDA_TYPE); - throw std::string (STRING_UDA_TYPE); return NULL; }