Add ReferenceCounted.touch() / Add missing retain() overrides

- Fixes netty#2163 - Inspector warnings
profer · Jan 28, 2014 · b887e35 · b887e35
1 parent 928901c
commit b887e35
Show file tree

Hide file tree

Showing 72 changed files with 450 additions and 21 deletions.
diff --git a/buffer/src/main/java/io/netty/buffer/AbstractDerivedByteBuf.java b/buffer/src/main/java/io/netty/buffer/AbstractDerivedByteBuf.java
@@ -45,6 +45,12 @@ public final ByteBuf retain(int increment) {
         return this;
     }
 
+    @Override
+    public final ByteBuf touch() {
+        unwrap().touch();
+        return this;
+    }
+
     @Override
     public final boolean release() {
         return unwrap().release();

diff --git a/buffer/src/main/java/io/netty/buffer/AbstractReferenceCountedByteBuf.java b/buffer/src/main/java/io/netty/buffer/AbstractReferenceCountedByteBuf.java
@@ -107,6 +107,11 @@ public ByteBuf retain(int increment) {
         return this;
     }
 
+    @Override
+    public final ByteBuf touch() {
+        return this;
+    }
+
     @Override
     public final boolean release() {
         for (;;) {

diff --git a/buffer/src/main/java/io/netty/buffer/AdvancedLeakAwareByteBuf.java b/buffer/src/main/java/io/netty/buffer/AdvancedLeakAwareByteBuf.java
@@ -716,6 +716,12 @@ public ByteBuf retain(int increment) {
         return super.retain(increment);
     }
 
+    @Override
+    public ByteBuf touch() {
+        leak.record();
+        return this;
+    }
+
     @Override
     public ByteBuf capacity(int newCapacity) {
         leak.record();

diff --git a/buffer/src/main/java/io/netty/buffer/ByteBuf.java b/buffer/src/main/java/io/netty/buffer/ByteBuf.java
@@ -1877,4 +1877,7 @@ public abstract class ByteBuf implements ReferenceCounted, Comparable<ByteBuf> {
 
     @Override
     public abstract ByteBuf retain();
+
+    @Override
+    public abstract ByteBuf touch();
 }
diff --git a/buffer/src/main/java/io/netty/buffer/ByteBufHolder.java b/buffer/src/main/java/io/netty/buffer/ByteBufHolder.java
@@ -42,4 +42,7 @@ public interface ByteBufHolder extends ReferenceCounted {
 
     @Override
     ByteBufHolder retain(int increment);
+
+    @Override
+    ByteBufHolder touch();
 }
diff --git a/buffer/src/main/java/io/netty/buffer/DefaultByteBufHolder.java b/buffer/src/main/java/io/netty/buffer/DefaultByteBufHolder.java
@@ -68,6 +68,12 @@ public ByteBufHolder retain(int increment) {
         return this;
     }
 
+    @Override
+    public ByteBufHolder touch() {
+        data.touch();
+        return this;
+    }
+
     @Override
     public boolean release() {
         return data.release();

diff --git a/buffer/src/main/java/io/netty/buffer/EmptyByteBuf.java b/buffer/src/main/java/io/netty/buffer/EmptyByteBuf.java
@@ -831,6 +831,11 @@ public ByteBuf retain(int increment) {
         return this;
     }
 
+    @Override
+    public ByteBuf touch() {
+        return this;
+    }
+
     @Override
     public boolean release() {
         return false;

diff --git a/buffer/src/main/java/io/netty/buffer/SimpleLeakAwareByteBuf.java b/buffer/src/main/java/io/netty/buffer/SimpleLeakAwareByteBuf.java
@@ -29,6 +29,11 @@ final class SimpleLeakAwareByteBuf extends WrappedByteBuf {
         this.leak = leak;
     }
 
+    @Override
+    public ByteBuf touch() {
+        return this;
+    }
+
     @Override
     public boolean release() {
         boolean deallocated =  super.release();

diff --git a/buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java b/buffer/src/main/java/io/netty/buffer/SwappedByteBuf.java
@@ -814,6 +814,12 @@ public ByteBuf retain(int increment) {
         return this;
     }
 
+    @Override
+    public ByteBuf touch() {
+        buf.touch();
+        return this;
+    }
+
     @Override
     public boolean release() {
         return buf.release();
@@ -847,6 +853,6 @@ public int compareTo(ByteBuf buffer) {
 
     @Override
     public String toString() {
-        return "Swapped(" + buf.toString() + ')';
+        return "Swapped(" + buf + ')';
     }
 }
diff --git a/buffer/src/main/java/io/netty/buffer/UnreleasableByteBuf.java b/buffer/src/main/java/io/netty/buffer/UnreleasableByteBuf.java
@@ -75,6 +75,11 @@ public ByteBuf retain() {
         return this;
     }
 
+    @Override
+    public ByteBuf touch() {
+        return this;
+    }
+
     @Override
     public boolean release() {
         return false;

diff --git a/buffer/src/main/java/io/netty/buffer/WrappedByteBuf.java b/buffer/src/main/java/io/netty/buffer/WrappedByteBuf.java
@@ -799,6 +799,12 @@ public ByteBuf retain() {
         return this;
     }
 
+    @Override
+    public ByteBuf touch() {
+        buf.touch();
+        return this;
+    }
+
     @Override
     public boolean isReadable(int size) {
         return buf.isReadable(size);

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/ComposedLastHttpContent.java b/codec-http/src/main/java/io/netty/handler/codec/http/ComposedLastHttpContent.java
@@ -49,6 +49,11 @@ public LastHttpContent retain() {
         return this;
     }
 
+    @Override
+    public LastHttpContent touch() {
+        return this;
+    }
+
     @Override
     public LastHttpContent duplicate() {
         return copy();

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/DefaultFullHttpRequest.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultFullHttpRequest.java
@@ -72,6 +72,12 @@ public FullHttpRequest retain(int increment) {
         return this;
     }
 
+    @Override
+    public FullHttpRequest touch() {
+        content.touch();
+        return this;
+    }
+
     @Override
     public boolean release() {
         return content.release();

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/DefaultFullHttpResponse.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultFullHttpResponse.java
@@ -75,6 +75,12 @@ public FullHttpResponse retain(int increment) {
         return this;
     }
 
+    @Override
+    public FullHttpResponse touch() {
+        content.touch();
+        return this;
+    }
+
     @Override
     public boolean release() {
         return content.release();

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpContent.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpContent.java
@@ -67,6 +67,12 @@ public HttpContent retain(int increment) {
         return this;
     }
 
+    @Override
+    public HttpContent touch() {
+        content.touch();
+        return this;
+    }
+
     @Override
     public boolean release() {
         return content.release();

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/DefaultLastHttpContent.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultLastHttpContent.java
@@ -69,6 +69,12 @@ public LastHttpContent retain() {
         return this;
     }
 
+    @Override
+    public LastHttpContent touch() {
+        super.touch();
+        return this;
+    }
+
     @Override
     public HttpHeaders trailingHeaders() {
         return trailingHeaders;

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/FullHttpMessage.java b/codec-http/src/main/java/io/netty/handler/codec/http/FullHttpMessage.java
@@ -29,6 +29,9 @@ public interface FullHttpMessage extends HttpMessage, LastHttpContent {
     @Override
     FullHttpMessage retain();
 
+    @Override
+    FullHttpMessage touch();
+
     @Override
     FullHttpMessage duplicate();
 }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/FullHttpRequest.java b/codec-http/src/main/java/io/netty/handler/codec/http/FullHttpRequest.java
@@ -29,6 +29,9 @@ public interface FullHttpRequest extends HttpRequest, FullHttpMessage {
     @Override
     FullHttpRequest retain();
 
+    @Override
+    FullHttpRequest touch();
+
     @Override
     FullHttpRequest duplicate();
 

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/FullHttpResponse.java b/codec-http/src/main/java/io/netty/handler/codec/http/FullHttpResponse.java
@@ -29,6 +29,9 @@ public interface FullHttpResponse extends HttpResponse, FullHttpMessage {
     @Override
     FullHttpResponse retain();
 
+    @Override
+    FullHttpResponse touch();
+
     @Override
     FullHttpResponse duplicate();
 

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContent.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContent.java
@@ -38,4 +38,7 @@ public interface HttpContent extends HttpObject, ByteBufHolder {
 
     @Override
     HttpContent retain(int increment);
+
+    @Override
+    HttpContent touch();
 }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/LastHttpContent.java b/codec-http/src/main/java/io/netty/handler/codec/http/LastHttpContent.java
@@ -74,6 +74,11 @@ public LastHttpContent retain(int increment) {
             return this;
         }
 
+        @Override
+        public LastHttpContent touch() {
+            return this;
+        }
+
         @Override
         public boolean release() {
             return false;
@@ -101,6 +106,9 @@ public String toString() {
     @Override
     LastHttpContent retain();
 
+    @Override
+    LastHttpContent touch();
+
     @Override
     LastHttpContent duplicate();
 }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractDiskHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractDiskHttpData.java
@@ -396,4 +396,9 @@ private static byte[] readFrom(File src) throws IOException {
     public File getFile() throws IOException {
         return file;
     }
+
+    @Override
+    public HttpData touch() {
+        return this;
+    }
 }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractHttpData.java
@@ -130,4 +130,7 @@ public HttpData retain(int increment) {
         super.retain(increment);
         return this;
     }
+
+    @Override
+    public abstract HttpData touch();
 }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractMemoryHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractMemoryHttpData.java
@@ -257,4 +257,12 @@ public boolean renameTo(File dest) throws IOException {
     public File getFile() throws IOException {
         throw new IOException("Not represented by a file");
     }
+
+    @Override
+    public HttpData touch() {
+        if (byteBuf != null) {
+            byteBuf.touch();
+        }
+        return this;
+    }
 }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/Attribute.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/Attribute.java
@@ -42,4 +42,7 @@ public interface Attribute extends HttpData {
 
     @Override
     Attribute retain(int increment);
+
+    @Override
+    Attribute touch();
 }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/DiskAttribute.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/DiskAttribute.java
@@ -122,7 +122,7 @@ public String toString() {
         try {
             return getName() + '=' + getValue();
         } catch (IOException e) {
-            return getName() + "=IoException";
+            return getName() + '=' + e;
         }
     }
 
@@ -192,4 +192,10 @@ public Attribute retain() {
         super.retain();
         return this;
     }
+
+    @Override
+    public Attribute touch() {
+        super.touch();
+        return this;
+    }
 }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/DiskFileUpload.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/DiskFileUpload.java
@@ -211,4 +211,10 @@ public FileUpload retain() {
         super.retain();
         return this;
     }
+
+    @Override
+    public FileUpload touch() {
+        super.touch();
+        return this;
+    }
 }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/FileUpload.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/FileUpload.java
@@ -67,4 +67,7 @@ public interface FileUpload extends HttpData {
 
     @Override
     FileUpload retain(int increment);
+
+    @Override
+    FileUpload touch();
 }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpData.java
@@ -208,4 +208,7 @@ public interface HttpData extends InterfaceHttpData, ByteBufHolder {
 
     @Override
     HttpData retain(int increment);
+
+    @Override
+    HttpData touch();
 }
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java
@@ -1161,6 +1161,7 @@ public void setDecoderResult(DecoderResult result) {
 
     private static final class WrappedFullHttpRequest extends WrappedHttpRequest implements FullHttpRequest {
         private final HttpContent content;
+
         private WrappedFullHttpRequest(HttpRequest request, HttpContent content) {
             super(request);
             this.content = content;
@@ -1214,6 +1215,12 @@ public FullHttpRequest retain() {
             return this;
         }
 
+        @Override
+        public FullHttpRequest touch() {
+            content.touch();
+            return this;
+        }
+
         @Override
         public ByteBuf content() {
             return content.content();

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/InterfaceHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/InterfaceHttpData.java
@@ -35,4 +35,13 @@ enum HttpDataType {
      * @return The HttpDataType
      */
     HttpDataType getHttpDataType();
+
+    @Override
+    InterfaceHttpData retain();
+
+    @Override
+    InterfaceHttpData retain(int increment);
+
+    @Override
+    InterfaceHttpData touch();
 }