# HG changeset patch # User goetz # Date 1434975739 -7200 # Node ID e73d834e5b499e3000883c8abbe862262878c887 # Parent 73a4dd2fcd43bd4a82f3b7f853a76d80f1608951 8129423: Fix unlink() of LogCompilation tmp files lost in merge of 8007993 and 8060074. Reviewed-by: kvn, simonis diff -r 73a4dd2fcd43 -r e73d834e5b49 hotspot/src/share/vm/compiler/compileLog.cpp --- a/hotspot/src/share/vm/compiler/compileLog.cpp Fri Jun 19 17:46:42 2015 -0700 +++ b/hotspot/src/share/vm/compiler/compileLog.cpp Mon Jun 22 14:22:19 2015 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -58,13 +58,15 @@ CompileLog::~CompileLog() { delete _out; // Close fd in fileStream::~fileStream() _out = NULL; + // Remove partial file after merging in CompileLog::finish_log_on_error + unlink(_file); FREE_C_HEAP_ARRAY(char, _identities); FREE_C_HEAP_ARRAY(char, _file); } // see_tag, pop_tag: Override the default do-nothing methods on xmlStream. -// These methods provide a hook for managing the the extra context markup. +// These methods provide a hook for managing the extra context markup. void CompileLog::see_tag(const char* tag, bool push) { if (_context.size() > 0 && _out != NULL) { _out->write(_context.base(), _context.size());