[groovy] branch master updated: GROOVY-9257: Could not create Groovysh with JDK 11 and Spring-Boot

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new e836764  GROOVY-9257: Could not create Groovysh with JDK 11 and Spring-Boot
e836764 is described below

commit e83676497c11218deee11ae6cc3e91d305a47a17
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Sep 25 15:25:35 2019 +1000

    GROOVY-9257: Could not create Groovysh with JDK 11 and Spring-Boot
---
 .../groovy/org/apache/groovy/groovysh/util/PackageHelperImpl.groovy    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelperImpl.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelperImpl.groovy
index 36d16d24..703b097 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelperImpl.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelperImpl.groovy
@@ -23,6 +23,7 @@ import groovy.transform.CompileStatic
 import org.codehaus.groovy.tools.shell.util.Logger
 import org.codehaus.groovy.tools.shell.util.Preferences
 
+import java.nio.file.NoSuchFileException
 import java.util.jar.JarEntry
 import java.util.jar.JarFile
 import java.util.prefs.PreferenceChangeEvent
@@ -262,7 +263,7 @@ Files.walkFileTree(fs.getPath('modules'),
                     ze.printStackTrace()
                 }
                 LOG.debug("Error opening zipfile : '${url.getFile()}',  ${ze.toString()}")
-            } catch (FileNotFoundException fnfe) {
+            } catch (FileNotFoundException | NoSuchFileException fnfe) {
                 LOG.debug("Error opening file : '${url.getFile()}',  ${fnfe.toString()}")
             }
         }