From 50bea87e0e8ba964081c19b0444cc6b27ae5cb55 Mon Sep 17 00:00:00 2001 From: David Turanski Date: Wed, 12 Dec 2012 17:50:19 -0500 Subject: [PATCH] INT-2859 Fix Python OOM Error INT-2859 - Remove Unnecessary Guard Condition --- .../scripting/jsr223/AbstractScriptExecutor.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/AbstractScriptExecutor.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/AbstractScriptExecutor.java index e3fa153e38..061045348f 100644 --- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/AbstractScriptExecutor.java +++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/AbstractScriptExecutor.java @@ -37,15 +37,18 @@ abstract class AbstractScriptExecutor implements ScriptExecutor { protected final Log logger = LogFactory.getLog(this.getClass()); - protected final ScriptEngineManager scriptEngineManager = new ScriptEngineManager(); + protected final ScriptEngine scriptEngine; protected final String language; public AbstractScriptExecutor(String language) { Assert.hasText(language, "language must not be empty"); this.language = language; + + scriptEngine = new ScriptEngineManager().getEngineByName(this.language); + if (logger.isDebugEnabled()) { - ScriptEngine scriptEngine = scriptEngineManager.getEngineByName(this.language); + if (scriptEngine == null) { logger.error(invlalidLanguageMessage(this.language)); } @@ -61,11 +64,6 @@ abstract class AbstractScriptExecutor implements ScriptExecutor { public Object executeScript(ScriptSource scriptSource, Map variables) { Object result = null; - ScriptEngine scriptEngine = this.scriptEngineManager.getEngineByName(this.language); - - if (scriptEngine == null) { - throw new ScriptingException(invlalidLanguageMessage(this.language)); - } try { if (variables != null) {