Plug ThreadLocal memory leak

src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java

@@ -145,7 +145,7 @@ public void addArchivedFileSet(
 
             delegate.addArchivedFileSet(fs);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -172,7 +172,7 @@ public void addArchivedFileSet(final File archiveFile, final String prefix) {
 
             delegate.addArchivedFileSet(fs);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -195,7 +195,7 @@ public void addArchivedFileSet(final File archiveFile, final String[] includes,
 
             delegate.addArchivedFileSet(fs);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -216,7 +216,7 @@ public void addArchivedFileSet(final File archiveFile) {
 
             delegate.addArchivedFileSet(fs);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -241,7 +241,7 @@ public void addDirectory(
 
             doAddFileSet(fs);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -254,7 +254,7 @@ public void addSymlink(String symlinkName, String symlinkDestination) {
         try {
             delegate.addSymlink(symlinkName, symlinkDestination);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -267,7 +267,7 @@ public void addSymlink(String symlinkName, int permissions, String symlinkDestin
         try {
             delegate.addSymlink(symlinkName, permissions, symlinkDestination);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -289,7 +289,7 @@ public void addDirectory(final File directory, final String prefix) {
 
             doAddFileSet(fs);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -313,7 +313,7 @@ public void addDirectory(final File directory, final String[] includes, final St
 
             doAddFileSet(fs);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -335,7 +335,7 @@ public void addDirectory(final File directory) {
 
             doAddFileSet(fs);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -351,7 +351,7 @@ public void addFile(final File inputFile, final String destFileName, final int p
 
                 delegate.addFile(inputFile, rootPrefix + destFileName, permissions);
             } finally {
-                inPublicApi.set(null);
+                inPublicApi.remove();
             }
         }
     }
@@ -368,7 +368,7 @@ public void addFile(final File inputFile, final String destFileName) {
 
                 delegate.addFile(inputFile, rootPrefix + destFileName);
             } finally {
-                inPublicApi.set(null);
+                inPublicApi.remove();
             }
         }
     }
@@ -383,7 +383,7 @@ public void createArchive() throws IOException {
             delegate.setForced(forced);
             delegate.createArchive();
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -396,7 +396,7 @@ public int getDefaultDirectoryMode() {
         try {
             return delegate.getDefaultDirectoryMode();
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -409,7 +409,7 @@ public void setDefaultDirectoryMode(final int mode) {
         try {
             delegate.setDefaultDirectoryMode(mode);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -422,7 +422,7 @@ public int getDefaultFileMode() {
         try {
             return delegate.getDefaultFileMode();
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -435,7 +435,7 @@ public void setDefaultFileMode(final int mode) {
         try {
             delegate.setDefaultFileMode(mode);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -448,7 +448,7 @@ public File getDestFile() {
         try {
             return delegate.getDestFile();
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -461,7 +461,7 @@ public void setDestFile(final File destFile) {
         try {
             delegate.setDestFile(destFile);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -472,7 +472,7 @@ public Map<String, ArchiveEntry> getFiles() {
         try {
             return delegate.getFiles();
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -485,7 +485,7 @@ public boolean getIncludeEmptyDirs() {
         try {
             return delegate.getIncludeEmptyDirs();
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -498,7 +498,7 @@ public void setIncludeEmptyDirs(final boolean includeEmptyDirs) {
         try {
             delegate.setIncludeEmptyDirs(includeEmptyDirs);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -511,7 +511,7 @@ public boolean isForced() {
         try {
             return delegate.isForced();
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -525,7 +525,7 @@ public void setForced(final boolean forced) {
             this.forced = forced;
             delegate.setForced(forced);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -538,7 +538,7 @@ public boolean isSupportingForced() {
         try {
             return delegate.isSupportingForced();
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -563,7 +563,7 @@ public void addArchivedFileSet(final ArchivedFileSet fileSet) {
 
             delegate.addArchivedFileSet(fs);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -578,7 +578,7 @@ public void addArchivedFileSet(ArchivedFileSet archivedFileSet, Charset charset)
 
             delegate.addArchivedFileSet(fs, charset);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -595,7 +595,7 @@ public void addFileSet(final FileSet fileSet) {
 
             doAddFileSet(fs);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -676,7 +676,7 @@ public void addResource(final PlexusIoResource resource, final String destFileNa
             try {
                 delegate.addResource(resource, rootPrefix + destFileName, permissions);
             } finally {
-                inPublicApi.set(null);
+                inPublicApi.remove();
             }
         }
     }
@@ -690,7 +690,7 @@ public void addResources(final PlexusIoResourceCollection resources) {
         try {
             delegate.addResources(resources);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -719,7 +719,7 @@ public void setDuplicateBehavior(final String duplicate) {
         try {
             delegate.setDuplicateBehavior(duplicate);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -740,7 +740,7 @@ public void setDirectoryMode(final int mode) {
         try {
             delegate.setDirectoryMode(mode);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }
 
@@ -761,7 +761,7 @@ public void setFileMode(final int mode) {
         try {
             delegate.setFileMode(mode);
         } finally {
-            inPublicApi.set(null);
+            inPublicApi.remove();
         }
     }