Merge

Fri, 11 Oct 2013 17:08:22 -0400

author
hseigel
date
Fri, 11 Oct 2013 17:08:22 -0400
changeset 5892
df268195b0ea
parent 5890
26ae62bc26c4
parent 5891
0db3ba3f6870
child 5894
83dbf427fedd

Merge

     1.1 --- a/src/share/vm/services/runtimeService.cpp	Fri Oct 11 15:04:53 2013 -0400
     1.2 +++ b/src/share/vm/services/runtimeService.cpp	Fri Oct 11 17:08:22 2013 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -119,7 +119,7 @@
    1.11  #endif /* USDT2 */
    1.12  
    1.13    // Print the time interval in which the app was executing
    1.14 -  if (PrintGCApplicationConcurrentTime) {
    1.15 +  if (PrintGCApplicationConcurrentTime && _app_timer.is_updated()) {
    1.16      gclog_or_tty->date_stamp(PrintGCDateStamps);
    1.17      gclog_or_tty->stamp(PrintGCTimeStamps);
    1.18      gclog_or_tty->print_cr("Application time: %3.7f seconds",

mercurial