Fix compilation issue due to jdk bug Inference fails for type variabl…

…e return constraint, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6302954
shijinkui · Feb 20, 2012 · bb6d140 · bb6d140
1 parent c5582a1
commit bb6d140
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/common/src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java b/common/src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java
@@ -612,6 +612,7 @@ private boolean casSweepVotes(int cmp, int val) {
     @SuppressWarnings("unchecked")
     static <E> E cast(Object item) {
         // assert item == null || item.getClass() != Node.class;
+        // Explicit cast, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6302954
         return (E) item;
     }
 
@@ -653,7 +654,8 @@ private E xfer(E e, boolean haveData, int how, long nanos) {
                             }
                         }
                         LockSupport.unpark(p.waiter);
-                        return LegacyLinkedTransferQueue.cast(item);
+                        // Explicit cast, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6302954
+                        return (E) LegacyLinkedTransferQueue.cast(item);
                     }
                 }
                 Node n = p.next;
@@ -737,7 +739,8 @@ private E awaitMatch(Node s, Node pred, E e, boolean timed, long nanos) {
             if (item != e) {                  // matched
                 // assert item != s;
                 s.forgetContents();           // avoid garbage
-                return LegacyLinkedTransferQueue.cast(item);
+                // Explicit cast, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6302954
+                return (E) LegacyLinkedTransferQueue.cast(item);
             }
             if ((w.isInterrupted() || timed && nanos <= 0) &&
                     s.casItem(e, s)) {        // cancel
@@ -825,7 +828,8 @@ private E firstDataItem() {
             Object item = p.item;
             if (p.isData) {
                 if (item != null && item != p) {
-                    return LegacyLinkedTransferQueue.cast(item);
+                    // Explicit cast, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6302954
+                    return (E) LegacyLinkedTransferQueue.cast(item);
                 }
             }
             else if (item == null) {
@@ -878,7 +882,8 @@ private void advance(Node prev) {
                 Object item = p.item;
                 if (p.isData) {
                     if (item != null && item != p) {
-                        nextItem = LegacyLinkedTransferQueue.cast(item);
+                        // Explicit cast, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6302954
+                        nextItem = (E) LegacyLinkedTransferQueue.cast(item);
                         nextNode = p;
                         return;
                     }