Fix for #1403: grab resets the extension module (category class) cache

groovy · Oct 5, 2022 · 83535fa · 83535fa
1 parent 4118605
commit 83535fa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/...jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/GrabTests.java b/...jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/GrabTests.java
@@ -35,7 +35,7 @@ public void testGrab() {
             "}\n",
 
             "Test.groovy",
-            "@Grab('joda-time:joda-time:2.10.13;transitive=false')\n" +
+            "@Grab('joda-time:joda-time:2.11.2;transitive=false')\n" +
             "import org.joda.time.DateTime\n" +
             "void printDate() {\n" +
             "  def now = new DateTime()\n" +
@@ -67,7 +67,7 @@ public void testGrabError() {
 
             "Test.groovy",
             "@Grapes([\n" +
-            "  @Grab('joda-time:joda-time:2.10.13;transitive=false'),\n" +
+            "  @Grab('joda-time:joda-time:2.11.2;transitive=false'),\n" +
             "  @Grab(group='org.aspectj', module='aspectjweaver', version='1.x')\n" +
             "])\n" +
             "class Test {\n" +
@@ -107,7 +107,7 @@ public void testGrabConfig() {
 
             "Test.groovy",
             "@GrabConfig(systemClassLoader=true)\n" +
-            "@Grab(group='mysql', module='mysql-connector-java', version='5.1.15', transitive=false)\n" +
+            "@Grab(group='mysql', module='mysql-connector-java', version='5.1.49', transitive=false)\n" +
             "class Test {\n" +
             "}\n",
         };

diff --git a/...t.groovy.core/src/org/codehaus/jdt/groovy/internal/compiler/GroovyClassLoaderFactory.java b/...t.groovy.core/src/org/codehaus/jdt/groovy/internal/compiler/GroovyClassLoaderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2021 the original author or authors.
+ * Copyright 2009-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -347,8 +347,10 @@ private GrapeAwareGroovyClassLoader(final IProject project, final ClassLoader pa
 
         @Override
         public void addURL(final URL url) {
-            this.grabbed = true;
             super.addURL(url);
+            this.grabbed = true;
+            this.defaultCategories = null;
+            this.defaultStaticCategories = null;
         }
 
         /** {@code true} if any grabbing is done */

diff --git a/....tests/src/org/codehaus/groovy/eclipse/test/launch/GroovyScriptLaunchShortcutTests.groovy b/....tests/src/org/codehaus/groovy/eclipse/test/launch/GroovyScriptLaunchShortcutTests.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2021 the original author or authors.
+ * Copyright 2009-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -277,7 +277,7 @@ final class GroovyScriptLaunchShortcutTests extends GroovyEclipseTestSuite {
     void testScriptLaunch13() {
         def unit = addGroovySource('''\
             |@GrabConfig(systemClassLoader=true)
-            |@Grab('mysql:mysql-connector-java:5.1.6')
+            |@Grab('mysql:mysql-connector-java:5.1.49')
             |def xxx
             |
             |println "Why won't this run?"