#464: Restaure default behaviour

Signed-off-by: Eric Bussieres <eric.bussieres@ssq.ca>
PebbleTemplates · Aug 22, 2019 · 23245d3 · 23245d3
1 parent 06270c5
commit 23245d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...ava/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java b/...ava/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java
@@ -7,6 +7,8 @@
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.ClassUtils;
 
+import static org.springframework.core.io.ResourceLoader.CLASSPATH_URL_PREFIX;
+
 public class PebbleTemplateAvailabilityProvider implements TemplateAvailabilityProvider {
 
   @Override
@@ -16,7 +18,7 @@ public boolean isTemplateAvailable(String view, Environment environment, ClassLo
       PropertyResolver resolver = new RelaxedPropertyResolver(environment, "pebble.");
       String prefix = resolver.getProperty("prefix", PebbleProperties.DEFAULT_PREFIX);
       String suffix = resolver.getProperty("suffix", PebbleProperties.DEFAULT_SUFFIX);
-      return resourceLoader.getResource(prefix + view + suffix).exists();
+      return resourceLoader.getResource(CLASSPATH_URL_PREFIX + prefix + view + suffix).exists();
     }
     return false;
   }

diff --git a/...ava/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java b/...ava/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java
@@ -5,6 +5,8 @@
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.ClassUtils;
 
+import static org.springframework.core.io.ResourceLoader.CLASSPATH_URL_PREFIX;
+
 public class PebbleTemplateAvailabilityProvider implements TemplateAvailabilityProvider {
 
   @Override
@@ -13,7 +15,7 @@ public boolean isTemplateAvailable(String view, Environment environment, ClassLo
     if (ClassUtils.isPresent("com.mitchellbosecke.pebble.PebbleEngine", classLoader)) {
       String prefix = environment.getProperty("pebble.prefix", PebbleProperties.DEFAULT_PREFIX);
       String suffix = environment.getProperty("pebble.suffix", PebbleProperties.DEFAULT_SUFFIX);
-      return resourceLoader.getResource(prefix + view + suffix).exists();
+      return resourceLoader.getResource(CLASSPATH_URL_PREFIX + prefix + view + suffix).exists();
     }
     return false;
   }