You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2007/09/14 16:11:32 UTC
svn commit: r575690 -
/incubator/sling/trunk/sling-servlet/src/main/java/org/apache/sling/launcher/servlet/SlingServlet.java
Author: cziegeler
Date: Fri Sep 14 07:11:32 2007
New Revision: 575690
URL: http://svn.apache.org/viewvc?rev=575690&view=rev
Log:
Prevent NPE when obr resource is not found.
Modified:
incubator/sling/trunk/sling-servlet/src/main/java/org/apache/sling/launcher/servlet/SlingServlet.java
Modified: incubator/sling/trunk/sling-servlet/src/main/java/org/apache/sling/launcher/servlet/SlingServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling-servlet/src/main/java/org/apache/sling/launcher/servlet/SlingServlet.java?rev=575690&r1=575689&r2=575690&view=diff
==============================================================================
--- incubator/sling/trunk/sling-servlet/src/main/java/org/apache/sling/launcher/servlet/SlingServlet.java (original)
+++ incubator/sling/trunk/sling-servlet/src/main/java/org/apache/sling/launcher/servlet/SlingServlet.java Fri Sep 14 07:11:32 2007
@@ -312,7 +312,10 @@
if ( repoLocation != null && repoLocation.indexOf(":/") < 1 && repoLocation.startsWith("/")) {
try {
final URL url = this.getServletContext().getResource(repoLocation);
- props.put(OBR_REPOSITORY_URL, url.toExternalForm());
+ // only if we get back a resource url, we update it
+ if ( url != null ) {
+ props.put(OBR_REPOSITORY_URL, url.toExternalForm());
+ }
} catch (MalformedURLException e) {
// if an exception occurs, we ignore it
}