--- a/hotspot/src/os/posix/vm/os_posix.cpp	Wed May 04 11:29:05 2016 +0200
+++ b/hotspot/src/os/posix/vm/os_posix.cpp	Mon May 09 14:15:39 2016 +0300
@@ -47,6 +47,12 @@
 
 // Check core dump limit and report possible place where core can be found
 void os::check_dump_limit(char* buffer, size_t bufferSize) {
+  if (!FLAG_IS_DEFAULT(CreateCoredumpOnCrash) && !CreateCoredumpOnCrash) {
+    jio_snprintf(buffer, bufferSize, "CreateCoredumpOnCrash is disabled from command line");
+    VMError::record_coredump_status(buffer, false);
+    return;
+  }
+
   int n;
   struct rlimit rlim;
   bool success;