From 8b3b8d070e3e177d580bd9da337ad73ebb707170 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 9 Oct 2015 22:54:35 +0200 Subject: [PATCH] Consistently detect spring-beans.dtd reference in last path segment Issue: SPR-13549 --- .../springframework/beans/factory/xml/BeansDtdResolver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java index 70b64e2ee9..ad096bff7b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java @@ -59,8 +59,8 @@ public class BeansDtdResolver implements EntityResolver { } if (systemId != null && systemId.endsWith(DTD_EXTENSION)) { int lastPathSeparator = systemId.lastIndexOf("/"); - int dtdNameStart = systemId.indexOf(DTD_NAME); - if (dtdNameStart > lastPathSeparator) { + int dtdNameStart = systemId.indexOf(DTD_NAME, lastPathSeparator); + if (dtdNameStart != -1) { String dtdFile = DTD_FILENAME + DTD_EXTENSION; if (logger.isTraceEnabled()) { logger.trace("Trying to locate [" + dtdFile + "] in Spring jar on classpath");