diff options
Diffstat (limited to 'c++/src/H5Group.cpp')
| -rw-r--r-- | c++/src/H5Group.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp index 6c0239f..8725b54 100644 --- a/c++/src/H5Group.cpp +++ b/c++/src/H5Group.cpp @@ -187,13 +187,16 @@ DataSpace Group::getRegion(void *ref, H5R_type_t ref_type) const //-------------------------------------------------------------------------- void Group::close() { - herr_t ret_value = H5Gclose( id ); - if( ret_value < 0 ) - { - throw GroupIException("Group::close", "H5Gclose failed"); - } - // reset the id because the group that it represents is now closed - id = 0; + if (p_valid_id(id)) + { + herr_t ret_value = H5Gclose( id ); + if( ret_value < 0 ) + { + throw GroupIException("Group::close", "H5Gclose failed"); + } + // reset the id because the group that it represents is now closed + id = 0; + } } //-------------------------------------------------------------------------- @@ -227,14 +230,12 @@ void Group::throwException(const H5std_string func_name, const H5std_string msg) //-------------------------------------------------------------------------- Group::~Group() { - // The group id will be closed properly try { - decRefCount(); + close(); } catch (Exception close_error) { - cerr << "Group::~Group - " << close_error.getDetailMsg() << endl; + cerr << "Group::~Group - " << close_error.getDetailMsg() << endl; } - } #ifndef H5_NO_NAMESPACE |