From 32b51d689ea8c25eafd92035821fa70d69e40fdf Mon Sep 17 00:00:00 2001
From: Philippe Mouawad <pmouawad@apache.org>
Date: Sat, 2 Mar 2013 19:48:59 +0000
Subject: [PATCH] Bug 54268 - Improve CPU and memory usage Factor out code
 Bugzilla Id: 54268

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1451929 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: cb248782edbd9754edd11fe10e5c5f8fae91d4cd
---
 .../jmeter/extractor/RegexExtractor.java       | 18 +-----------------
 .../org/apache/jmeter/util/JMeterUtils.java    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/org/apache/jmeter/extractor/RegexExtractor.java
index a59f1c78e1..fed6c3352b 100644
--- a/src/components/org/apache/jmeter/extractor/RegexExtractor.java
+++ b/src/components/org/apache/jmeter/extractor/RegexExtractor.java
@@ -164,23 +164,7 @@ public class RegexExtractor extends AbstractScopedTestElement implements PostPro
         } catch (MalformedCachePatternException e) {
             log.error("Error in pattern: " + regex);
         } finally {
-            clearMatcherMemory(matcher, pattern);
-        }
-    }
-
-    /**
-     * Hack to make matcher clean the two internal buffers it keeps in memory which size is equivalent to 
-     * the unzipped page size
-     * @param matcher {@link Perl5Matcher}
-     * @param pattern Pattern
-     */
-    private final void clearMatcherMemory(Perl5Matcher matcher, Pattern pattern) {
-        try {
-            if(pattern != null) {
-                matcher.matches("", pattern); // $NON-NLS-1$
-            }
-        } catch (Exception e) {
-            // NOOP
+            JMeterUtils.clearMatcherMemory(matcher, pattern);
         }
     }
 
diff --git a/src/core/org/apache/jmeter/util/JMeterUtils.java b/src/core/org/apache/jmeter/util/JMeterUtils.java
index 19f13a0501..a0d70e80e2 100644
--- a/src/core/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/org/apache/jmeter/util/JMeterUtils.java
@@ -1309,4 +1309,20 @@ public class JMeterUtils implements UnitTestManager {
         System.gc();
         System.runFinalization();
     }
+    
+    /**
+     * Hack to make matcher clean the two internal buffers it keeps in memory which size is equivalent to 
+     * the unzipped page size
+     * @param matcher {@link Perl5Matcher}
+     * @param pattern Pattern
+     */
+    public static final void clearMatcherMemory(Perl5Matcher matcher, Pattern pattern) {
+        try {
+            if(pattern != null) {
+                matcher.matches("", pattern); // $NON-NLS-1$
+            }
+        } catch (Exception e) {
+            // NOOP
+        }
+    }
 }
\ No newline at end of file