1.1 --- a/src/share/vm/runtime/perfData.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/runtime/perfData.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2012, 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 @@ -213,7 +213,10 @@
1.11
1.12 void PerfLongVariant::sample() {
1.13
1.14 - assert(_sample_helper != NULL || _sampled != NULL, "unexpected state");
1.15 + // JJJ - This should not happen. Maybe the first sample is taken
1.16 + // while the _sample_helper is being null'ed out.
1.17 + // assert(_sample_helper != NULL || _sampled != NULL, "unexpected state");
1.18 + if (_sample_helper == NULL) return;
1.19
1.20 if (_sample_helper != NULL) {
1.21 *(jlong*)_valuep = _sample_helper->take_sample();
