Merge pull request #19 from riptano/DSP-19407-upgrade-review-remarks

DSP-19407 after upgrade review remarks

Author: jtgrabowski

common/src/main/java/io/netty/util/concurrent/AbstractScheduledEventExecutor.java

@@ -38,7 +38,7 @@ public int compare(ScheduledFutureTask<?> o1, ScheduledFutureTask<?> o2) {
                 }
             };
 
-    PriorityQueue<ScheduledFutureTask<?>> scheduledTaskQueue;
+    protected PriorityQueue<ScheduledFutureTask<?>> scheduledTaskQueue;
 
     protected AbstractScheduledEventExecutor() {
     }

common/src/main/java/io/netty/util/internal/PlatformDependent.java

@@ -673,13 +673,15 @@ public static void freeDirectNoCleaner(ByteBuffer buffer) {
     }
 
     private static void incrementMemoryCounter(int capacity) {
-        if (DIRECT_MEMORY_COUNTER != null) {
-            long newUsedMemory = DIRECT_MEMORY_COUNTER.addAndGet(capacity);
+        for (;;) {
+            long usedMemory = DIRECT_MEMORY_COUNTER.get();
+            long newUsedMemory = usedMemory + capacity;
             if (DIRECT_MEMORY_LIMIT > 0 && newUsedMemory > DIRECT_MEMORY_LIMIT) {
-                DIRECT_MEMORY_COUNTER.addAndGet(-capacity);
                 throw new OutOfDirectMemoryError("failed to allocate " + capacity
-                        + " byte(s) of direct memory (used: " + (newUsedMemory - capacity)
-                        + ", max: " + DIRECT_MEMORY_LIMIT + ')');
+                        + " byte(s) of direct memory (used: " + usedMemory + ", max: " + DIRECT_MEMORY_LIMIT + ')');
+            }
+            if (DIRECT_MEMORY_COUNTER.compareAndSet(usedMemory, newUsedMemory)) {
+                break;
             }
         }
     }