Browse Source

Guard against NPEs when no base URI is given.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@388927 13f79535-47bb-0310-9956-ffa450edef68
tags/fop-0_92-beta
Jeremias Maerki 18 years ago
parent
commit
938f018f23
1 changed files with 3 additions and 1 deletions
  1. 3
    1
      src/java/org/apache/fop/servlet/ServletContextURIResolver.java

+ 3
- 1
src/java/org/apache/fop/servlet/ServletContextURIResolver.java View File

@@ -52,7 +52,9 @@ public class ServletContextURIResolver implements URIResolver {
if (href.startsWith(SERVLET_CONTEXT_PROTOCOL)) {
return resolveServletContextURI(href.substring(SERVLET_CONTEXT_PROTOCOL.length()));
} else {
if (base.startsWith(SERVLET_CONTEXT_PROTOCOL) && (href.indexOf(':') < 0)) {
if (base != null
&& base.startsWith(SERVLET_CONTEXT_PROTOCOL)
&& (href.indexOf(':') < 0)) {
String abs = base + href;
return resolveServletContextURI(
abs.substring(SERVLET_CONTEXT_PROTOCOL.length()));

Loading…
Cancel
Save