Adapt to changes in Argeo TP.

[gpl/argeo-slc.git] / org.argeo.slc.repo / src / org / argeo / slc / repo / osgi / BndWrapper.java

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java
index 17bdbe11772ab1a71a40d82d8e533b3a36175bee..56dda5bdf7d37cba0c1c395274da517fae628647 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java
@@ -18,9 +18,9 @@ import org.eclipse.aether.artifact.DefaultArtifact;
 import org.osgi.framework.Version;
 import org.springframework.beans.factory.BeanNameAware;
 
-import aQute.lib.osgi.Builder;
-import aQute.lib.osgi.Constants;
-import aQute.lib.osgi.Jar;
+import aQute.bnd.osgi.Builder;
+import aQute.bnd.osgi.Constants;
+import aQute.bnd.osgi.Jar;
 
 /** Utilities around the BND library, which manipulates OSGi metadata. */
 public class BndWrapper implements Constants, CategorizedNameVersion,
@@ -44,7 +44,7 @@ public class BndWrapper implements Constants, CategorizedNameVersion,
                try {
                        byte[] jarBytes = IOUtils.toByteArray(in);
 
-                       jar = new Jar(null, new ByteArrayInputStream(jarBytes));
+                       jar = new Jar(name, new ByteArrayInputStream(jarBytes));
                        Manifest sourceManifest = jar.getManifest();
 
                        Version versionToUse;
@@ -124,9 +124,13 @@ public class BndWrapper implements Constants, CategorizedNameVersion,
                } catch (Exception e) {
                        throw new SlcException("Cannot wrap jar", e);
                } finally {
-                       b.close();
-                       if (jar != null)
-                               jar.close();
+                       try {
+                               b.close();
+                               if (jar != null)
+                                       jar.close();
+                       } catch (Exception e) {
+                               // silent
+                       }
                }
 
        }