RFR: jsr166 jdk9 integration wave 7

[Martin Buchholz]

On Tue, Jun 28, 2016 at 5:55 AM, Paul Sandoz <paul.sandoz at oracle.com> wrote:

>
> AtomicInteger
> —
>
>  185     public final int incrementAndGet() {
>  186         return (int)VALUE.getAndAdd(this, 1) + 1;
>  187     }
>
>
> You can use VALUE.addAndGet same for other similar methods here and in
> other classes.
>

Done:

 Index: src/main/java/util/concurrent/atomic/AtomicInteger.java
===================================================================
RCS file:
/export/home/jsr166/jsr166/jsr166/src/main/java/util/concurrent/atomic/AtomicInteger.java,v
retrieving revision 1.47
diff -u -U 1 -r1.47 AtomicInteger.java
--- src/main/java/util/concurrent/atomic/AtomicInteger.java 17 Jun 2016
14:27:58 -0000 1.47
+++ src/main/java/util/concurrent/atomic/AtomicInteger.java 28 Jun 2016
16:28:39 -0000
@@ -156,3 +156,3 @@
     public final int incrementAndGet() {
-        return (int)VALUE.getAndAdd(this, 1) + 1;
+        return (int)VALUE.addAndGet(this, 1);
     }
@@ -165,3 +165,3 @@
     public final int decrementAndGet() {
-        return (int)VALUE.getAndAdd(this, -1) - 1;
+        return (int)VALUE.addAndGet(this, -1);
     }
@@ -175,3 +175,3 @@
     public final int addAndGet(int delta) {
-        return (int)VALUE.getAndAdd(this, delta) + delta;
+        return (int)VALUE.addAndGet(this, delta);
     }
Index: src/main/java/util/concurrent/atomic/AtomicIntegerArray.java
===================================================================
RCS file:
/export/home/jsr166/jsr166/jsr166/src/main/java/util/concurrent/atomic/AtomicIntegerArray.java,v
retrieving revision 1.48
diff -u -U 1 -r1.48 AtomicIntegerArray.java
--- src/main/java/util/concurrent/atomic/AtomicIntegerArray.java 17 Jun
2016 14:27:58 -0000 1.48
+++ src/main/java/util/concurrent/atomic/AtomicIntegerArray.java 28 Jun
2016 16:28:39 -0000
@@ -170,3 +170,3 @@
     public final int incrementAndGet(int i) {
-        return (int)AA.getAndAdd(array, i, 1) + 1;
+        return (int)AA.addAndGet(array, i, 1);
     }
@@ -180,3 +180,3 @@
     public final int decrementAndGet(int i) {
-        return (int)AA.getAndAdd(array, i, -1) - 1;
+        return (int)AA.addAndGet(array, i, -1);
     }
@@ -191,3 +191,3 @@
     public final int addAndGet(int i, int delta) {
-        return (int)AA.getAndAdd(array, i, delta) + delta;
+        return (int)AA.addAndGet(array, i, delta);
     }
Index: src/main/java/util/concurrent/atomic/AtomicLong.java
===================================================================
RCS file:
/export/home/jsr166/jsr166/jsr166/src/main/java/util/concurrent/atomic/AtomicLong.java,v
retrieving revision 1.53
diff -u -U 1 -r1.53 AtomicLong.java
--- src/main/java/util/concurrent/atomic/AtomicLong.java 17 Jun 2016
14:27:58 -0000 1.53
+++ src/main/java/util/concurrent/atomic/AtomicLong.java 28 Jun 2016
16:28:39 -0000
@@ -171,3 +171,3 @@
     public final long incrementAndGet() {
-        return (long)VALUE.getAndAdd(this, 1L) + 1L;
+        return (long)VALUE.addAndGet(this, 1L);
     }
@@ -180,3 +180,3 @@
     public final long decrementAndGet() {
-        return (long)VALUE.getAndAdd(this, -1L) - 1L;
+        return (long)VALUE.addAndGet(this, -1L);
     }
@@ -190,3 +190,3 @@
     public final long addAndGet(long delta) {
-        return (long)VALUE.getAndAdd(this, delta) + delta;
+        return (long)VALUE.addAndGet(this, delta);
     }
Index: src/main/java/util/concurrent/atomic/AtomicLongArray.java
===================================================================
RCS file:
/export/home/jsr166/jsr166/jsr166/src/main/java/util/concurrent/atomic/AtomicLongArray.java,v
retrieving revision 1.48
diff -u -U 1 -r1.48 AtomicLongArray.java
--- src/main/java/util/concurrent/atomic/AtomicLongArray.java 17 Jun 2016
14:27:58 -0000 1.48
+++ src/main/java/util/concurrent/atomic/AtomicLongArray.java 28 Jun 2016
16:28:39 -0000
@@ -169,3 +169,3 @@
     public final long incrementAndGet(int i) {
-        return (long)AA.getAndAdd(array, i, 1L) + 1L;
+        return (long)AA.addAndGet(array, i, 1L);
     }
@@ -179,3 +179,3 @@
     public final long decrementAndGet(int i) {
-        return (long)AA.getAndAdd(array, i, -1L) - 1L;
+        return (long)AA.addAndGet(array, i, -1L);
     }
@@ -190,3 +190,3 @@
     public long addAndGet(int i, long delta) {
-        return (long)AA.getAndAdd(array, i, delta) + delta;
+        return (long)AA.addAndGet(array, i, delta);
     }