[svn] commit: r1869 - /trunk/src/lib/cc/data.cc

[BIND 10 source code commits]

Author: jelte
Date: Thu May 20 09:15:36 2010
New Revision: 1869

Log:
Applied patch that came out of the review ticket http://bind10.isc.org/ticket/20
(noting that we probably might want to think about catching bad_alloc somewhere, but more on the event level, not here, and doing that right requires some careful checking of other code too)

Modified:
    trunk/src/lib/cc/data.cc

Modified: trunk/src/lib/cc/data.cc
==============================================================================
--- trunk/src/lib/cc/data.cc (original)
+++ trunk/src/lib/cc/data.cc Thu May 20 09:15:36 2010
@@ -204,47 +204,27 @@
 //
 ElementPtr
 Element::create(const int i) {
-    try {
-        return ElementPtr(new IntElement(i));
-    } catch (std::bad_alloc) {
-        return ElementPtr();
-    }
+    return ElementPtr(new IntElement(i));
 }
 
 ElementPtr
 Element::create(const double d) {
-    try {
-        return ElementPtr(new DoubleElement(d));
-    } catch (std::bad_alloc) {
-        return ElementPtr();
-    }
+    return ElementPtr(new DoubleElement(d));
 }
 
 ElementPtr
 Element::create(const std::string& s) {
-    try {
-        return ElementPtr(new StringElement(s));
-    } catch (std::bad_alloc) {
-        return ElementPtr();
-    }
+    return ElementPtr(new StringElement(s));
 }
 
 ElementPtr
 Element::create(const bool b) {
-    try {
-        return ElementPtr(new BoolElement(b));
-    } catch (std::bad_alloc) {
-        return ElementPtr();
-    }
+    return ElementPtr(new BoolElement(b));
 }
 
 ElementPtr
 Element::create(const std::vector<ElementPtr>& v) {
-    try {
-        return ElementPtr(new ListElement(v));
-    } catch (std::bad_alloc) {
-        return ElementPtr();
-    }
+    return ElementPtr(new ListElement(v));
 }
 
 ElementPtr
@@ -255,11 +235,7 @@
             isc_throw(TypeError, "Map tag is too long");
         }
     }
-    try {
-        return ElementPtr(new MapElement(m));
-    } catch (std::bad_alloc) {
-        return ElementPtr();
-    }
+    return ElementPtr(new MapElement(m));
 }