Browse Source

Polishing

pull/23430/head
Juergen Hoeller 6 years ago
parent
commit
39925c334d
  1. 4
      spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
  2. 2
      spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java

4
spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java

@ -102,8 +102,8 @@ public class ObjectUtilsTests { @@ -102,8 +102,8 @@ public class ObjectUtilsTests {
assertTrue(isEmpty(new Object[0]));
assertTrue(isEmpty(new Integer[0]));
assertFalse(isEmpty(new int[] { 42 }));
assertFalse(isEmpty(new Integer[] { 42 }));
assertFalse(isEmpty(new int[] {42}));
assertFalse(isEmpty(new Integer[] {42}));
}
@Test

2
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java

@ -657,7 +657,7 @@ public class ResourceHttpRequestHandler extends WebContentGenerator @@ -657,7 +657,7 @@ public class ResourceHttpRequestHandler extends WebContentGenerator
}
if (path.contains("..") && StringUtils.cleanPath(path).contains("../")) {
if (logger.isTraceEnabled()) {
logger.trace("Invalid Path contains \"../\" after call to StringUtils#cleanPath: [" + path + "]");
logger.trace("Path contains \"../\" after call to StringUtils#cleanPath: [" + path + "]");
}
return true;
}

Loading…
Cancel
Save