o Updated to correct issues discussed at pull request 27.

Author: ChristianSchulte

src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarXZFileResourceCollection.java

@@ -1,37 +1,37 @@
-/*
- * Copyright 2016 Codehaus.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.codehaus.plexus.archiver.tar;
-
-import java.io.File;
-
-/**
- *
- * @author philip.lourandos
- */
-public class PlexusIoTarXZFileResourceCollection extends
-        PlexusIoTarFileResourceCollection
-{
-
-    public PlexusIoTarXZFileResourceCollection()
-    {
-    }
-
-    @Override
-    protected TarFile newTarFile(File file)
-    {
-        return new XZTarFile( file );
-    }
-}
+/*
+ * Copyright 2016 Codehaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.plexus.archiver.tar;
+
+import java.io.File;
+
+/**
+ *
+ * @author philip.lourandos
+ */
+public class PlexusIoTarXZFileResourceCollection extends
+        PlexusIoTarFileResourceCollection
+{
+
+    public PlexusIoTarXZFileResourceCollection()
+    {
+    }
+
+    @Override
+    protected TarFile newTarFile(File file)
+    {
+        return new XZTarFile( file );
+    }
+}

src/main/java/org/codehaus/plexus/archiver/tar/TarXZUnArchiver.java

@@ -1,40 +1,40 @@
-/*
- * Copyright 2016 Codehaus.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.codehaus.plexus.archiver.tar;
-
-import java.io.File;
-
-/**
- *
- * @author philip.lourandos
- */
-public class TarXZUnArchiver extends TarUnArchiver
-{
-    public TarXZUnArchiver() {
-        setupCompressionMethod();
-    }
-
-    public TarXZUnArchiver(File sourceFile) {
-        super(sourceFile);
-        
-        setupCompressionMethod();
-    }
-    
-    private final void setupCompressionMethod() 
-    {
-        setCompression(TarUnArchiver.UntarCompressionMethod.XZ);
-    }
-}
+/*
+ * Copyright 2016 Codehaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.plexus.archiver.tar;
+
+import java.io.File;
+
+/**
+ *
+ * @author philip.lourandos
+ */
+public class TarXZUnArchiver extends TarUnArchiver
+{
+    public TarXZUnArchiver() {
+        setupCompressionMethod();
+    }
+
+    public TarXZUnArchiver(File sourceFile) {
+        super(sourceFile);
+        
+        setupCompressionMethod();
+    }
+    
+    private final void setupCompressionMethod() 
+    {
+        setCompression(TarUnArchiver.UntarCompressionMethod.XZ);
+    }
+}

src/main/java/org/codehaus/plexus/archiver/tar/XZTarFile.java

@@ -1,40 +1,40 @@
-/*
- * Copyright 2016 Codehaus.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.codehaus.plexus.archiver.tar;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import org.codehaus.plexus.archiver.xz.XZUnArchiver;
-
-/**
- *
- * @author philip.lourandos
- */
-public class XZTarFile extends TarFile 
-{
-
-    public XZTarFile ( File file ) 
-    {
-        super(file);
-    }
-
-    @Override
-    protected InputStream getInputStream( File file ) throws IOException
-    {
-        return XZUnArchiver.getXZInputStream( super.getInputStream( file ) );
-    }
-}
+/*
+ * Copyright 2016 Codehaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.plexus.archiver.tar;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import org.codehaus.plexus.archiver.xz.XZUnArchiver;
+
+/**
+ *
+ * @author philip.lourandos
+ */
+public class XZTarFile extends TarFile 
+{
+
+    public XZTarFile ( File file ) 
+    {
+        super(file);
+    }
+
+    @Override
+    protected InputStream getInputStream( File file ) throws IOException
+    {
+        return XZUnArchiver.getXZInputStream( super.getInputStream( file ) );
+    }
+}

src/main/java/org/codehaus/plexus/archiver/xz/PlexusIoXZResourceCollection.java

@@ -1,50 +1,56 @@
-/*
- * Copyright 2016 Codehaus.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.codehaus.plexus.archiver.xz;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import org.codehaus.plexus.components.io.attributes.Java7FileAttributes;
-import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
-import org.codehaus.plexus.components.io.resources.PlexusIoCompressedFileResourceCollection;
-
-/**
- *
- * @author lore
- */
-public class PlexusIoXZResourceCollection extends PlexusIoCompressedFileResourceCollection {
-
-    @Override
-    protected PlexusIoResourceAttributes getAttributes(File file) throws IOException {
-        return new Java7FileAttributes(file, new HashMap<Integer, String>(), new HashMap<Integer, String>());
-    }
-
-    @Override
-    protected String getDefaultExtension() {
-        return ".xz";
-    }
-
-    @Override
-    protected InputStream getInputStream(File file) throws IOException {
-        FileInputStream fileIs = new FileInputStream(file);
-
-        return XZUnArchiver.getXZInputStream(fileIs);
-
-    }
-}
+/*
+ * Copyright 2016 Codehaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.plexus.archiver.xz;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import org.codehaus.plexus.components.io.attributes.Java7FileAttributes;
+import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
+import org.codehaus.plexus.components.io.resources.PlexusIoCompressedFileResourceCollection;
+import org.codehaus.plexus.util.IOUtil;
+
+/**
+ *
+ * @author lore
+ */
+public class PlexusIoXZResourceCollection extends PlexusIoCompressedFileResourceCollection {
+
+    @Override
+    protected PlexusIoResourceAttributes getAttributes(File file) throws IOException {
+        return new Java7FileAttributes(file, new HashMap<Integer, String>(), new HashMap<Integer, String>());
+    }
+
+    @Override
+    protected String getDefaultExtension() {
+        return ".xz";
+    }
+
+    @Override
+    protected InputStream getInputStream(File file) throws IOException {
+        FileInputStream fileIs = new FileInputStream(file);
+        try {
+            final InputStream result = XZUnArchiver.getXZInputStream( fileIs );
+            fileIs = null;
+            return result;
+        }
+        finally {
+            IOUtil.close(fileIs);
+        }
+    }
+}