Set the destroyed flag at the correct time and fix a the httpupload example to release all resources

Norman Maurer · Norman Maurer · commit e85ae721b24e · 2013-07-11T13:48:37.000+02:00
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java
@@ -1204,9 +1204,9 @@ protected InterfaceHttpData getFileUpload(String delimiter) throws ErrorDataDeco
      */
     public void destroy() {
         checkDestroyed();
+        cleanFiles();
         destroyed = true;
 
-        cleanFiles();
         if (undecodedChunk != null && undecodedChunk.refCnt() > 0) {
             undecodedChunk.release();
             undecodedChunk = null;
diff --git a/example/src/main/java/io/netty/example/http/upload/HttpUploadServerHandler.java b/example/src/main/java/io/netty/example/http/upload/HttpUploadServerHandler.java
@@ -216,8 +216,12 @@ private void readHttpDataChunkByChunk() {
             while (decoder.hasNext()) {
                 InterfaceHttpData data = decoder.next();
                 if (data != null) {
-                    // new value
-                    writeHttpData(data);
+                    try {
+                        // new value
+                        writeHttpData(data);
+                    } finally {
+                        data.release();
+                    }
                 }
             }
         } catch (EndOfDataDecoderException e1) {
@@ -275,7 +279,6 @@ private void writeHttpData(InterfaceHttpData data) {
                 }
             }
         }
-        //BufUtil.release(data);
     }
 
     private void writeResponse(Channel channel) {

Original file line number	Diff line number	Diff line change
`@@ -216,8 +216,12 @@ private void readHttpDataChunkByChunk() {`
`216`	`216`	`while (decoder.hasNext()) {`
`217`	`217`	`InterfaceHttpData data = decoder.next();`
`218`	`218`	`if (data != null) {`
`219`		`- // new value`
`220`		`- writeHttpData(data);`
	`219`	`+ try {`
	`220`	`+ // new value`
	`221`	`+ writeHttpData(data);`
	`222`	`+ } finally {`
	`223`	`+ data.release();`
	`224`	`+ }`
`221`	`225`	`}`
`222`	`226`	`}`
`223`	`227`	`} catch (EndOfDataDecoderException e1) {`
`@@ -275,7 +279,6 @@ private void writeHttpData(InterfaceHttpData data) {`
`275`	`279`	`}`
`276`	`280`	`}`
`277`	`281`	`}`
`278`		`- //BufUtil.release(data);`
`279`	`282`	`}`
`280`	`283`
`281`	`284`	`private void writeResponse(Channel channel) {`