--- old/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp	2018-05-21 21:32:02.933246344 +0900
+++ new/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp	2018-05-21 21:32:02.770245574 +0900
@@ -465,13 +465,15 @@
       last_native_ms = last_java_ms;
     }
     _sample.signal();
-    jlong java_interval = _interval_java == 0 ? max_jlong : MAX2<jlong>(_interval_java, 10);
-    jlong native_interval = _interval_native == 0 ? max_jlong : MAX2<jlong>(_interval_native, 10);
 
     jlong now_ms = get_monotonic_ms();
 
-    jlong next_j = java_interval + last_java_ms - now_ms;
-    jlong next_n = native_interval + last_native_ms - now_ms;
+    jlong next_j = (_interval_java == 0)
+                     ? max_jlong
+                     : MAX2<jlong>(_interval_java, 10) + last_java_ms - now_ms;
+    jlong next_n = (_interval_native == 0)
+                     ? max_jlong
+                     : MAX2<jlong>(_interval_native, 10) + last_native_ms - now_ms;
 
     jlong sleep_to_next = MIN2<jlong>(next_j, next_n);