changeset 48161:fed0e4b11604

8192154: JVM crashes inside some chroot environments on linux Reviewed-by: dholmes, sgehwolf, glaubitz
author bobv
date Thu, 30 Nov 2017 09:49:45 -0500
parents bef902d8fef1
children 464c63eb6d1f
files src/hotspot/os/linux/osContainer_linux.cpp
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/os/linux/osContainer_linux.cpp	Wed Nov 29 10:30:51 2017 -0800
+++ b/src/hotspot/os/linux/osContainer_linux.cpp	Thu Nov 30 09:49:45 2017 -0500
@@ -323,7 +323,12 @@
     }
   }
 
-  if (mntinfo != NULL) fclose(mntinfo);
+  fclose(mntinfo);
+
+  if (memory == NULL || cpuset == NULL || cpu == NULL || cpuacct == NULL) {
+    log_debug(os, container)("Required cgroup subsystems not found");
+    return;
+  }
 
   /*
    * Read /proc/self/cgroup and map host mount point to
@@ -383,12 +388,7 @@
     }
   }
 
-  if (cgroup != NULL) fclose(cgroup);
-
-  if (memory == NULL || cpuset == NULL || cpu == NULL) {
-    log_debug(os, container)("Required cgroup subsystems not found");
-    return;
-  }
+  fclose(cgroup);
 
   // We need to update the amount of physical memory now that
   // command line arguments have been processed.