From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 19 Jun 2012 13:28:46 +0000 (+0000)
Subject: Make import more robust
X-Git-Tag: argeo-slc-2.1.7~719
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=cdc8471021f12b7ec16f8fe2a6ce628fba1f4406;p=gpl%2Fargeo-slc.git

Make import more robust

git-svn-id: https://svn.argeo.org/slc/trunk@5322 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ImportBundlesZip.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ImportBundlesZip.java
index 8701688d8..092101a8d 100644
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ImportBundlesZip.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ImportBundlesZip.java
@@ -78,7 +78,13 @@ public class ImportBundlesZip implements Runnable {
 					log.warn(entryName + " has no MANIFEST");
 					continue entries;
 				}
-				NameVersion nv = RepoUtils.readNameVersion(manifest);
+				NameVersion nv;
+				try {
+					nv = RepoUtils.readNameVersion(manifest);
+				} catch (Exception e) {
+					log.warn("Cannot read name version from " + entryName, e);
+					continue entries;
+				}
 
 				// skip excluded bundles and their sources
 				if (excludedBundles.contains(extractBundleNameFromSourceName(nv