diff -r 9046db64ca39 -r cddef3bde924 src/hotspot/share/runtime/os_perf.hpp --- a/src/hotspot/share/runtime/os_perf.hpp Wed Sep 11 14:16:27 2019 +0200 +++ b/src/hotspot/share/runtime/os_perf.hpp Wed Sep 11 14:16:30 2019 +0200 @@ -41,12 +41,8 @@ } ~EnvironmentVariable() { - if (_key != NULL) { - FREE_C_HEAP_ARRAY(char, _key); - } - if (_value != NULL) { - FREE_C_HEAP_ARRAY(char, _value); - } + FREE_C_HEAP_ARRAY(char, _key); + FREE_C_HEAP_ARRAY(char, _value); } EnvironmentVariable(char* key, char* value) { @@ -181,15 +177,9 @@ } virtual ~SystemProcess(void) { - if (_name != NULL) { - FREE_C_HEAP_ARRAY(char, _name); - } - if (_path != NULL) { - FREE_C_HEAP_ARRAY(char, _path); - } - if (_command_line != NULL) { - FREE_C_HEAP_ARRAY(char, _command_line); - } + FREE_C_HEAP_ARRAY(char, _name); + FREE_C_HEAP_ARRAY(char, _path); + FREE_C_HEAP_ARRAY(char, _command_line); } };