You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/08/22 08:04:23 UTC

[1/2] karaf git commit: [KARAF-3811] Exception thrown when including the feature "feature" in Maven karaf:assembly goal

Repository: karaf
Updated Branches:
  refs/heads/master 9eb83655d -> 3c6acb12b


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


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

Branch: refs/heads/master
Commit: b059fd14acbc17923b2446aaba8c377473355d6d
Parents: 98b83da
Author: jonathanbyrne <jo...@yahoo.com>
Authored: Wed Jul 8 16:33:58 2015 -0400
Committer: jonathanbyrne <jo...@yahoo.com>
Committed: Wed Jul 8 16:33:58 2015 -0400

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


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


[2/2] karaf git commit: Merge branch 'master' of https://github.com/SourceScope/karaf

Posted by jb...@apache.org.
Merge branch 'master' of https://github.com/SourceScope/karaf


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

Branch: refs/heads/master
Commit: 3c6acb12bd9c7d9daad5d9c580153c0af3cdf37c
Parents: 9eb8365 b059fd1
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Aug 22 08:04:07 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Aug 22 08:04:07 2015 +0200

----------------------------------------------------------------------
 .../profile/assembly/AssemblyDeployCallback.java    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------