Ate Douma pushed to branch master at cms-community /
hippo-configuration-management
Commits:
7df391d7 by Ate Douma at 2017-06-26T10:41:59+02:00
HCM-150 Correct file and (re)source mapping to work the same on *nix and
Windows platforms
- ensure ResourceNameResolver uses and matches filepaths in lowercase as needed
for case-insensitive filesystems
- - - - -
1 changed file:
-
model/src/main/java/org/onehippo/cm/model/serializer/ResourceNameResolverImpl.java
Changes:
=====================================
model/src/main/java/org/onehippo/cm/model/serializer/ResourceNameResolverImpl.java
=====================================
---
a/model/src/main/java/org/onehippo/cm/model/serializer/ResourceNameResolverImpl.java
+++
b/model/src/main/java/org/onehippo/cm/model/serializer/ResourceNameResolverImpl.java
@@ -33,9 +33,9 @@ public class ResourceNameResolverImpl implements
ResourceNameResolver {
* @return unique filename within already known paths
*/
@Override
- public String generateName(String filePath) {
-
- final String generatedPath =
FileConfigurationUtils.generateUniquePath(filePath, knownFileEntries::contains,
0);
+ public String generateName(final String filePath) {
+ final String lowerCaseFilePath = filePath.toLowerCase();
+ final String generatedPath =
FileConfigurationUtils.generateUniquePath(lowerCaseFilePath,
knownFileEntries::contains, 0);
knownFileEntries.add(generatedPath);
return generatedPath;
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-configuration-management/commit/7df391d7a2667463dc75ddc2af22073db99086a1
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
