ViewVC Help

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

root/jsr166/jsr166/src/jsr166e/LongAdder.java

Comparing jsr166/src/jsr166e/LongAdder.java (file contents):
Revision 1.16 by jsr166, Mon May 5 01:57:35 2014 UTC vs.
Revision 1.17 by jsr166, Mon May 5 20:20:15 2014 UTC

#	Line 5 | Line 5
5		*/
6
7		package jsr166e;
8	<	import java.util.concurrent.atomic.AtomicLong;
8	>
9	>	import java.io.IOException;
10	>	import java.io.ObjectInputStream;
11	>	import java.io.ObjectOutputStream;
12		import java.io.Serializable;
13	+	import java.util.concurrent.atomic.AtomicLong;
14
15		/**
16		* One or more variables that together maintain an initially zero
#	Line 182 | Line 186 | public class LongAdder extends Striped64
186		return (double)sum();
187		}
188
189	<	private void writeObject(java.io.ObjectOutputStream s)
186	<	throws java.io.IOException {
189	>	private void writeObject(ObjectOutputStream s) throws IOException {
190		s.defaultWriteObject();
191		s.writeLong(sum());
192		}
193
194	<	private void readObject(java.io.ObjectInputStream s)
195	<	throws java.io.IOException, ClassNotFoundException {
194	>	private void readObject(ObjectInputStream s)
195	>	throws IOException, ClassNotFoundException {
196		s.defaultReadObject();
197		busy = 0;
198		cells = null;

Diff Legend

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