You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/09/21 13:35:43 UTC
svn commit: r999326 -
/karaf/branches/karaf-2.0.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
Author: gnodet
Date: Tue Sep 21 11:35:43 2010
New Revision: 999326
URL: http://svn.apache.org/viewvc?rev=999326&view=rev
Log:
KARAF-133: NPE when installing a bundle with a MANIFEST.MF not in the first entry of the zip
Patch provided by Ioannis Canellos
Modified:
karaf/branches/karaf-2.0.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
Modified: karaf/branches/karaf-2.0.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.0.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java?rev=999326&r1=999325&r2=999326&view=diff
==============================================================================
--- karaf/branches/karaf-2.0.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java (original)
+++ karaf/branches/karaf-2.0.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java Tue Sep 21 11:35:43 2010
@@ -557,6 +557,9 @@ public class FeaturesServiceImpl impleme
is.mark(256 * 1024);
JarInputStream jar = new JarInputStream(is);
Manifest m = jar.getManifest();
+ if(m == null) {
+ throw new BundleException("Manifest not present in the first entry of the zip");
+ }
String sn = m.getMainAttributes().getValue(Constants.BUNDLE_SYMBOLICNAME);
String vStr = m.getMainAttributes().getValue(Constants.BUNDLE_VERSION);
Version v = vStr == null ? Version.emptyVersion : Version.parseVersion(vStr);