# HG changeset patch
# User dsamersoff
# Date 1407248324 0
# Node ID 7e9ffb1fe1df810b961a0bf5dd1659d315139075
# Parent  a41d63a62923be0db4633d5a2f6b96996530adac# Parent  34036ccd1364f57108e88c9f1b441f256fe93222
Merge

diff -r a41d63a62923 -r 7e9ffb1fe1df hotspot/agent/src/os/solaris/proc/saproc.cpp
--- a/hotspot/agent/src/os/solaris/proc/saproc.cpp	Tue Aug 05 09:11:35 2014 -0400
+++ b/hotspot/agent/src/os/solaris/proc/saproc.cpp	Tue Aug 05 14:18:44 2014 +0000
@@ -661,30 +661,30 @@
   // read FileMapHeader
   size_t n = read(fd, pheader, sizeof(struct FileMapHeader));
   if (n != sizeof(struct FileMapHeader)) {
-    free(pheader);
-    close(fd);
     char errMsg[ERR_MSG_SIZE];
     sprintf(errMsg, "unable to read shared archive file map header from %s", classes_jsa);
+    close(fd);
+    free(pheader);
     THROW_NEW_DEBUGGER_EXCEPTION_(errMsg, 1);
   }
 
   // check file magic
   if (pheader->_magic != 0xf00baba2) {
-    free(pheader);
-    close(fd);
     char errMsg[ERR_MSG_SIZE];
     sprintf(errMsg, "%s has bad shared archive magic 0x%x, expecting 0xf00baba2",
                    classes_jsa, pheader->_magic);
+    close(fd);
+    free(pheader);
     THROW_NEW_DEBUGGER_EXCEPTION_(errMsg, 1);
   }
 
   // check version
   if (pheader->_version != CURRENT_ARCHIVE_VERSION) {
-    free(pheader);
-    close(fd);
     char errMsg[ERR_MSG_SIZE];
     sprintf(errMsg, "%s has wrong shared archive version %d, expecting %d",
                    classes_jsa, pheader->_version, CURRENT_ARCHIVE_VERSION);
+    close(fd);
+    free(pheader);
     THROW_NEW_DEBUGGER_EXCEPTION_(errMsg, 1);
   }