karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: Revert "[KARAF-3811] Exception thrown when including the feature "feature" in Maven karaf:assembly goal"
Date Sat, 22 Aug 2015 06:06:31 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 3c6acb12b -> d4f464abb


Revert "[KARAF-3811] Exception thrown when including the feature "feature" in Maven karaf:assembly
goal"

Already fixed by gnodet

This reverts commit b059fd14acbc17923b2446aaba8c377473355d6d.


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d4f464ab
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d4f464ab
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d4f464ab

Branch: refs/heads/master
Commit: d4f464abbe4bf3cde14dcdfbdee6b5cb3117f234
Parents: 3c6acb1
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Sat Aug 22 08:06:13 2015 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Sat Aug 22 08:06:13 2015 +0200

----------------------------------------------------------------------
 .../karaf/profile/assembly/AssemblyDeployCallback.java | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/d4f464ab/profile/src/main/java/org/apache/karaf/profile/assembly/AssemblyDeployCallback.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/AssemblyDeployCallback.java
b/profile/src/main/java/org/apache/karaf/profile/assembly/AssemblyDeployCallback.java
index dc64b05..4ef295c 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/AssemblyDeployCallback.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/AssemblyDeployCallback.java
@@ -209,17 +209,8 @@ public class AssemblyDeployCallback implements Deployer.DeployCallback
{
             Files.copy(is, bundleSystemFile, StandardCopyOption.REPLACE_EXISTING);
 
             Hashtable<String, String> headers = new Hashtable<>();
-            JarFile jar = null;
-            Attributes attributes;
-            try {
-                jar = new JarFile(bundleSystemFile.toFile());
-                attributes = jar.getManifest().getMainAttributes();
-            }
-            finally {
-                if (jar != null) {
-                    jar.close();
-                }
-            }
+            JarFile jar = new JarFile(bundleSystemFile.toFile());
+            Attributes attributes = jar.getManifest().getMainAttributes();
             for (Map.Entry attr : attributes.entrySet()) {
                 headers.put(attr.getKey().toString(), attr.getValue().toString());
             }


Mime
View raw message