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:37:13 UTC
svn commit: r999328 -
/karaf/branches/karaf-2.0.x/deployer/war/src/main/java/org/apache/karaf/deployer/war/WarDeploymentListener.java
Author: gnodet
Date: Tue Sep 21 11:37:13 2010
New Revision: 999328
URL: http://svn.apache.org/viewvc?rev=999328&view=rev
Log:
KARAF-138: WarDeploymentListener: checks for manifest osgi entries but fails if no manifest is found
Patch provided by Achim Nierbeck
Modified:
karaf/branches/karaf-2.0.x/deployer/war/src/main/java/org/apache/karaf/deployer/war/WarDeploymentListener.java
Modified: karaf/branches/karaf-2.0.x/deployer/war/src/main/java/org/apache/karaf/deployer/war/WarDeploymentListener.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.0.x/deployer/war/src/main/java/org/apache/karaf/deployer/war/WarDeploymentListener.java?rev=999328&r1=999327&r2=999328&view=diff
==============================================================================
--- karaf/branches/karaf-2.0.x/deployer/war/src/main/java/org/apache/karaf/deployer/war/WarDeploymentListener.java (original)
+++ karaf/branches/karaf-2.0.x/deployer/war/src/main/java/org/apache/karaf/deployer/war/WarDeploymentListener.java Tue Sep 21 11:37:13 2010
@@ -61,7 +61,7 @@ public class WarDeploymentListener imple
}
// Only handle non OSGi bundles
Manifest m = jar.getManifest();
- if (m.getMainAttributes().getValue(
+ if (m!= null && m.getMainAttributes().getValue(
new Attributes.Name("Bundle-SymbolicName")) != null
&& m.getMainAttributes().getValue(
new Attributes.Name("Bundle-Version")) != null) {
@@ -128,7 +128,7 @@ public class WarDeploymentListener imple
}
// alter the original URL artifact
} catch (Exception e) {
- LOGGER.warn("Unable to create Weapp-Context from web.xml", e);
+ LOGGER.warn("Unable to create Webapp-Context from web.xml", e);
}
return new URL("war", null, protocol + ":" + path + "?Webapp-Context="
+ displayName);