--- old/src/os/posix/vm/os_posix.cpp	2012-06-26 17:29:44.577069532 -0700
+++ new/src/os/posix/vm/os_posix.cpp	2012-06-26 17:29:44.241237538 -0700
@@ -33,19 +33,18 @@
 
 // Check core dump limit and report possible place where core can be found
 void os::check_or_create_dump(void* exceptionRecord, void* contextRecord, char* buffer, size_t bufferSize) {
+  int n;
   struct rlimit rlim;
-  static char cwd[O_BUFLEN];
   bool success;
 
-  get_current_directory(cwd, sizeof(cwd));
-
   if (getrlimit(RLIMIT_CORE, &rlim) != 0) {
-    jio_snprintf(buffer, bufferSize, "%s/core or core.%d (may not exist)", cwd, current_process_id());
+    n = os::get_core_paths(buffer, bufferSize);
+    jio_snprintf(buffer + n, bufferSize - n, "%s/core or core.%d (may not exist)");
     success = true;
   } else {
     switch(rlim.rlim_cur) {
       case RLIM_INFINITY:
-        jio_snprintf(buffer, bufferSize, "%s/core or core.%d", cwd, current_process_id());
+        os::get_core_paths(buffer, bufferSize);
         success = true;
         break;
       case 0:
@@ -53,7 +52,8 @@
         success = false;
         break;
       default:
-        jio_snprintf(buffer, bufferSize, "%s/core or core.%d (max size %lu kB). To ensure a full core dump, try \"ulimit -c unlimited\" before starting Java again", cwd, current_process_id(), (unsigned long)(rlim.rlim_cur >> 10));
+        n = os::get_core_paths(buffer, bufferSize);
+        jio_snprintf(buffer + n, bufferSize - n, " (max size %lu kB). To ensure a full core dump, try \"ulimit -c unlimited\" before starting Java again", (unsigned long)(rlim.rlim_cur >> 10));
         success = true;
         break;
     }