*** old/src/os/solaris/vm/os_solaris.cpp	Tue Nov 18 07:32:59 2014
--- new/src/os/solaris/vm/os_solaris.cpp	Tue Nov 18 07:32:58 2014

*** 504,514 ****
--- 504,514 ----
      if (board * processors_per_board + 0 >= limit_id) {
        board = 0;
      }
    }
    if (available_id != NULL) {
-     FREE_C_HEAP_ARRAY(bool, available_id, mtInternal);
    }
    return true;
  }
  
  void os::set_native_thread_name(const char *name) {

*** 536,546 ****
--- 536,546 ----
      } else {
        result = false;
      }
    }
    if (id_array != NULL) {
-     FREE_C_HEAP_ARRAY(processorid_t, id_array, mtInternal);
    }
    return result;
  }
  
  bool os::bind_to_processor(uint processor_id) {

*** 673,695 ****
--- 673,695 ----
      char           *library_path;
      char           *common_path = buf;
  
      // Determine search path count and required buffer size.
      if (dlinfo(RTLD_SELF, RTLD_DI_SERINFOSIZE, (void *)info) == -1) {
-       FREE_C_HEAP_ARRAY(char, buf, mtInternal);
        vm_exit_during_initialization("dlinfo SERINFOSIZE request", dlerror());
      }
  
      // Allocate new buffer and initialize.
      info = (Dl_serinfo*)NEW_C_HEAP_ARRAY(char, info_sz.dls_size, mtInternal);
      info->dls_size = info_sz.dls_size;
      info->dls_cnt = info_sz.dls_cnt;
  
      // Obtain search path information.
      if (dlinfo(RTLD_SELF, RTLD_DI_SERINFO, (void *)info) == -1) {
-       FREE_C_HEAP_ARRAY(char, buf, mtInternal);
-       FREE_C_HEAP_ARRAY(char, info, mtInternal);
        vm_exit_during_initialization("dlinfo SERINFO request", dlerror());
      }
  
      path = &info->dls_serpath[0];
  

*** 755,777 ****
--- 755,777 ----
      // tty->print_raw_cr(library_path);
  
      // Callee copies into its own buffer.
      Arguments::set_library_path(library_path);
  
-     FREE_C_HEAP_ARRAY(char, library_path, mtInternal);
-     FREE_C_HEAP_ARRAY(char, info, mtInternal);
    }
  
    // Extensions directories.
    sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home());
    Arguments::set_ext_dirs(buf);
  
    // Endorsed standards default directory.
    sprintf(buf, "%s" ENDORSED_DIR, Arguments::get_java_home());
    Arguments::set_endorsed_dirs(buf);
  
-   FREE_C_HEAP_ARRAY(char, buf, mtInternal);
  
  #undef SYS_EXT_DIR
  #undef EXTENSIONS_DIR
  #undef ENDORSED_DIR
  }

*** 1597,1611 ****
--- 1597,1611 ----
        }
      }
      // release the storage
      for (int i = 0; i < n; i++) {
        if (pelements[i] != NULL) {
-         FREE_C_HEAP_ARRAY(char, pelements[i], mtInternal);
        }
      }
      if (pelements != NULL) {
-       FREE_C_HEAP_ARRAY(char*, pelements, mtInternal);
      }
    } else {
      snprintf(buffer, buflen, "%s/lib%s.so", pname, fname);
      retval = true;
    }

*** 4676,4686 ****
--- 4676,4686 ----
        UseNUMA = false;
      } else {
        size_t lgrp_limit = os::numa_get_groups_num();
        int *lgrp_ids = NEW_C_HEAP_ARRAY(int, lgrp_limit, mtInternal);
        size_t lgrp_num = os::numa_get_leaf_groups(lgrp_ids, lgrp_limit);
-       FREE_C_HEAP_ARRAY(int, lgrp_ids, mtInternal);
        if (lgrp_num < 2) {
          // There's only one locality group, disable NUMA.
          UseNUMA = false;
        }
      }