[svn-r27834] Description:

    Close FAPL for external link test, to fix infinite loop closing the library.

Tested on:
    MacOSX/64 10.10.5 (amazon) w/serial 
    (too minor to require h5committest)

2 files changed, 6 insertions, 2 deletions

diff --git a/src/H5.c b/src/H5.c
index 29098bc..1bb75ad 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -333,8 +333,8 @@ H5_term_library(void)
         if(pending == 0) {
             pending += DOWN(AC);
             pending += DOWN(Z);
-            pending += DOWN(FD);
             pending += DOWN(P);
+            pending += DOWN(FD);
             pending += DOWN(PL);
             /* Don't shut down the error code until other APIs which use it are shut down */
             if(pending == 0)
diff --git a/test/links.c b/test/links.c
index 887a72c..577834d 100644
--- a/test/links.c
+++ b/test/links.c
@@ -6234,7 +6234,7 @@ error:
 static int
 external_link_strong(hid_t fapl, hbool_t new_format)
 {
-    hid_t       my_fapl;                        /* File access property list */
+    hid_t       my_fapl = (-1);                 /* File access property list */
     hid_t       fid1 = (-1), fid2 = (-1);       /* File ID */
     hid_t       gid1 = (-1), gid2 = (-1);       /* Group IDs */
     char        objname[NAME_BUF_SIZE];         /* Object name */
@@ -6283,11 +6283,15 @@ external_link_strong(hid_t fapl, hbool_t new_format)
     if(H5Gclose(gid2) < 0) TEST_ERROR
     if(H5Fclose(fid2) < 0) TEST_ERROR
 
+    /* Close fapl */
+    if(H5Pclose(my_fapl) < 0) TEST_ERROR
+
     PASSED();
     return 0;
 
 error:
     H5E_BEGIN_TRY {
+        H5Pclose(my_fapl);
         H5Gclose(fapl);
         H5Gclose(gid2);
         H5Gclose(gid1);