[FIXED JENKINS-14614] Removed unnecessary compilation of Groovy scripts.

jenkinsci · Aug 23, 2012 · 6ef488d · 6ef488d
1 parent 027598d
commit 6ef488d
Showing 1 changed file with 13 additions and 20 deletions.
diff --git a/src/main/java/hudson/plugins/warnings/parser/GroovyExpressionMatcher.java b/src/main/java/hudson/plugins/warnings/parser/GroovyExpressionMatcher.java
@@ -36,31 +36,22 @@ public class GroovyExpressionMatcher implements Serializable {
     public GroovyExpressionMatcher(final String script, final Warning falsePositive) {
         this.script = script;
         this.falsePositive = falsePositive;
-
-        compileScript();
     }
 
-    private void compileScript() {
-        GroovyShell shell = new GroovyShell(WarningsDescriptor.class.getClassLoader());
-        try {
-            compiled = shell.parse(script);
-        }
-        catch (CompilationFailedException exception) {
-            LOGGER.log(Level.SEVERE, "Groovy dynamic warnings parser: exception during compiling: ", exception);
+    private void compileScriptIfNotYetDone() {
+        synchronized (script) {
+             if (compiled == null) {
+                 GroovyShell shell = new GroovyShell(WarningsDescriptor.class.getClassLoader());
+                 try {
+                     compiled = shell.parse(script);
+                 }
+                 catch (CompilationFailedException exception) {
+                     LOGGER.log(Level.SEVERE, "Groovy dynamic warnings parser: exception during compiling: ", exception);
+                 }
+            }
         }
     }
 
-    /**
-     * Compiles the script.
-     *
-     * @return this
-     */
-    protected Object readResolve() {
-        compileScript();
-
-        return this;
-    }
-
     /**
      * Creates a new annotation for the specified match.
      *
@@ -69,6 +60,8 @@ protected Object readResolve() {
      * @return a new annotation for the specified pattern
      */
     public Warning createWarning(final Matcher matcher) {
+        compileScriptIfNotYetDone();
+
         Binding binding = new Binding();
         binding.setVariable("matcher", matcher);
         Object result = null;