Changeset 1477

Timestamp:

04/12/18 11:12:11 (6 years ago)

Author:

oabramkina

Message:

Implementing exception handling for accessing attribute value.

In certain cases attribute's id will be printed in the error message.

Location:

XIOS

Files:

• dev/XIOS_DEV_CMIP6/src/attribute_template_impl.hpp (modified) (1 diff)
• dev/XIOS_DEV_CMIP6/src/type/type_impl.hpp (modified) (2 diffs)
• trunk/src/attribute_template_impl.hpp (modified) (1 diff)
• trunk/src/type/type_impl.hpp (modified) (2 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/attribute_template_impl.hpp

@@ -71 +71 @@
          T CAttributeTemplate<T>::getValue(void) const
       {
-        return CType<T>::get() ;
+        try {
+          return CType<T>::get() ;
+        }
+        catch (xios::CException & exc)
+        {
+          StdString msg("On checking attribute with id=");
+          msg.append(this->getId());
+          msg.append(" : ");
+          msg.append("data is not initialized\n");
+          ERROR("template <typename T> void CType<T>::checkEmpty(void) const", << msg);
+        }
+
 /*
         if (SuperClass::isEmpty())

XIOS/dev/XIOS_DEV_CMIP6/src/type/type_impl.hpp

@@ -122 +122 @@
    CType<T>::operator T&()
    {
-    checkEmpty();
+     try
+     {
+       checkEmpty();
+     }
+     catch (xios::CException & exc)
+     {
+       StdString msg("Data is not initialized\n");
+       ERROR("template <typename T> void CType<T>::checkEmpty(void) const", << msg);
+     }
+
     return *ptrValue ;
    }
@@ -208 +217 @@
   void CType<T>::checkEmpty(void) const
   {
-    if (empty) ERROR("template <typename T> void CType<T>::checkEmpty(void) const", << "Data is not initialized") ;
+//    if (empty) ERROR("template <typename T> void CType<T>::checkEmpty(void) const", << "Data is not initialized") ;
+    if (empty) throw CException();
   }
 

XIOS/trunk/src/attribute_template_impl.hpp

@@ -71 +71 @@
          T CAttributeTemplate<T>::getValue(void) const
       {
-        return CType<T>::get() ;
+        try {
+          return CType<T>::get() ;
+        }
+        catch (xios::CException & exc)
+        {
+          StdString msg("On checking attribute with id=");
+          msg.append(this->getId());
+          msg.append(" : ");
+          msg.append("data is not initialized\n");
+          ERROR("template <typename T> void CType<T>::checkEmpty(void) const", << msg);
+        }
+
 /*
         if (SuperClass::isEmpty())

XIOS/trunk/src/type/type_impl.hpp

@@ -122 +122 @@
    CType<T>::operator T&()
    {
-    checkEmpty();
+     try
+     {
+       checkEmpty();
+     }
+     catch (xios::CException & exc)
+     {
+       StdString msg("Data is not initialized\n");
+       ERROR("template <typename T> void CType<T>::checkEmpty(void) const", << msg);
+     }
+
     return *ptrValue ;
    }
@@ -208 +217 @@
   void CType<T>::checkEmpty(void) const
   {
-    if (empty) ERROR("template <typename T> void CType<T>::checkEmpty(void) const", << "Data is not initialized") ;
+//    if (empty) ERROR("template <typename T> void CType<T>::checkEmpty(void) const", << "Data is not initialized") ;
+    if (empty) throw CException();
   }