ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/concurrent/TimeUnit.java

Comparing jsr166/src/main/java/util/concurrent/TimeUnit.java (file contents):
Revision 1.54 by jsr166, Sat Mar 26 16:06:52 2016 UTC vs.
Revision 1.55 by jsr166, Sat Mar 26 16:18:25 2016 UTC

#	Line 105 | Line 105 | public enum TimeUnit {
105		long ur = (s >= MICRO_SCALE) ? (s / MICRO_SCALE) : (MICRO_SCALE / s);
106		this.microRatio = ur;
107		this.maxMicros = Long.MAX_VALUE / ur;
108	<	long mr = (scale >= MILLI_SCALE) ? (s / MILLI_SCALE) : (MILLI_SCALE / s);
108	>	long mr = (s >= MILLI_SCALE) ? (s / MILLI_SCALE) : (MILLI_SCALE / s);
109		this.milliRatio = (int)mr;
110		this.maxMillis = Long.MAX_VALUE / mr;
111		long sr = (s >= SECOND_SCALE) ? (s / SECOND_SCALE) : (SECOND_SCALE / s);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines