Fix StringIndexOutOfBoundsException with watch patterns. Fixes #9610

Author: graemerocher

grails-core/src/main/groovy/grails/boot/GrailsApp.groovy

@@ -150,7 +150,7 @@ class GrailsApp extends SpringApplication {
                 configureDirectoryWatcher(directoryWatcher, dir.absolutePath)
             }
 
-            def locationLength = location.length() + 1
+            def locationLength = baseDirPath.length() + 1
 
             for(GrailsPlugin plugin in pluginManager.allPlugins) {
                 def watchedResourcePatterns = plugin.getWatchedResourcePatterns()
@@ -175,12 +175,12 @@ class GrailsApp extends SpringApplication {
                             }
                             first = false
                             if(wp.file) {
-                                def resolvedPath = new File(watchBase, wp.file.path.substring(locationLength))
+                                def resolvedPath = new File(watchBase, wp.file.canonicalPath.substring(locationLength))
                                 directoryWatcher.addWatchFile(resolvedPath)
                             }
                             else if(wp.directory && wp.extension) {
 
-                                def resolvedPath = new File(watchBase, wp.directory.path.substring(locationLength))
+                                def resolvedPath = new File(watchBase, wp.directory.canonicalPath.substring(locationLength))
                                 directoryWatcher.addWatchDirectory(resolvedPath, wp.extension)
                             }
                         }

grails-core/src/main/groovy/org/grails/plugins/support/WatchPatternParser.java

@@ -15,6 +15,9 @@
  */
 package org.grails.plugins.support;
 
+import grails.io.ResourceUtils;
+import grails.util.BuildSettings;
+import grails.util.GrailsStringUtils;
 import org.springframework.util.StringUtils;
 
 import java.io.File;
@@ -37,12 +40,24 @@ public List<WatchPattern> getWatchPatterns(List<String> patterns) {
         for (String pattern : patterns) {
             WatchPattern watchPattern = new WatchPattern();
             watchPattern.setPattern(pattern);
-            if (pattern.startsWith("file:")) {
-                pattern = pattern.substring(5);
+            boolean isClasspath = false;
+            if (pattern.startsWith(ResourceUtils.FILE_URL_PREFIX)) {
+                pattern = pattern.substring(ResourceUtils.FILE_URL_PREFIX.length());
+            }
+            else if (pattern.startsWith(ResourceUtils.CLASSPATH_URL_PREFIX)) {
+                pattern = pattern.substring(ResourceUtils.CLASSPATH_URL_PREFIX.length());
+                isClasspath = true;
             }
 
             if (pattern.contains(WILD_CARD)) {
-                watchPattern.setDirectory(new File(pattern.substring(0, pattern.indexOf(WILD_CARD))));
+                String dirPath = pattern.substring(0, pattern.indexOf(WILD_CARD));
+                if(!GrailsStringUtils.isBlank(dirPath)) {
+                    watchPattern.setDirectory(new File(dirPath));
+                }
+                else if(isClasspath && BuildSettings.BASE_DIR != null) {
+                    watchPattern.setDirectory(new File(BuildSettings.BASE_DIR, "src/main/resources"));
+                }
+
                 setExtension(pattern, watchPattern);
                 watchPatterns.add(watchPattern);
             }