Pārlūkot izejas kodu

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 pirms 18 gadiem
vecāks
revīzija
938f018f23

+ 3
- 1
src/java/org/apache/fop/servlet/ServletContextURIResolver.java Parādīt failu

if (href.startsWith(SERVLET_CONTEXT_PROTOCOL)) { if (href.startsWith(SERVLET_CONTEXT_PROTOCOL)) {
return resolveServletContextURI(href.substring(SERVLET_CONTEXT_PROTOCOL.length())); return resolveServletContextURI(href.substring(SERVLET_CONTEXT_PROTOCOL.length()));
} else { } 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; String abs = base + href;
return resolveServletContextURI( return resolveServletContextURI(
abs.substring(SERVLET_CONTEXT_PROTOCOL.length())); abs.substring(SERVLET_CONTEXT_PROTOCOL.length()));

Notiek ielāde…
Atcelt
Saglabāt