[svn-r22553] update the H5Iget_file_id implementation to use the VOL

1 files changed, 6 insertions, 9 deletions

diff --git a/src/H5F.c b/src/H5F.c
index f03ed42..cf38bc2 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -1445,23 +1445,20 @@ H5F_get_id(H5F_t *file, hbool_t app_ref)
     HDassert(file);
 
     /* MSC - Will need to switch to that later */
-#if 0
+#if 1
     if (FAIL == (ret_value = H5I_get_id(file, H5I_FILE))) {
-        /* resurrect the ID */
-        /* Get an atom for the file */
-        if((ret_value = H5I_register(H5I_FILE, file, app_ref)) < 0)
-            HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to atomize file handle")
-        /* attach VOL information to the ID */
-        if (H5VL_native_register_aux(ret_value) < 0)
-            HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "can't attach vol info to ID")
+        /* resurrect the ID - Register an ID with the native plugin */
+        if((ret_value = H5VL_native_register(H5I_FILE, file, app_ref)) < 0)
+            HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
     }
     else {
         /* Increment ref count on existing ID */
         if(H5I_inc_ref(ret_value, app_ref) < 0)
             HGOTO_ERROR(H5E_ATOM, H5E_CANTSET, FAIL, "incrementing file ID failed")
     }
+    file->file_id = ret_value;
 #endif
-#if 1
+#if 0
     if(file->file_id == -1) {
         /* resurrect the ID */
         if((file->file_id = H5VL_native_register(H5I_FILE, file, app_ref)) < 0)