svn commit: r1071162 - in /camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script: ScriptBuilder.java ScriptLanguage.java

[davsclaus]

Author: davsclaus
Date: Wed Feb 16 07:01:33 2011
New Revision: 1071162

URL: http://svn.apache.org/viewvc?rev=1071162&view=rev
Log:
Polished.

Modified:
    
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
    
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguage.java

Modified: 
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java?rev=1071162&r1=1071161&r2=1071162&view=diff
==============================================================================
--- 
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
 (original)
+++ 
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
 Wed Feb 16 07:01:33 2011
@@ -489,7 +489,7 @@ public class ScriptBuilder implements Ex
             }
         } catch (ScriptException e) {
             if (LOG.isDebugEnabled()) {
-                LOG.debug("Script compile failed: " + e, e);
+                LOG.debug("Script compile failed: " + e.getMessage(), e);
             }
             throw createScriptCompileException(e);
         } catch (IOException e) {
@@ -508,7 +508,7 @@ public class ScriptBuilder implements Ex
             return result;
         } catch (ScriptException e) {
             if (LOG.isDebugEnabled()) {
-                LOG.debug("Script evaluation failed: " + e, e);
+                LOG.debug("Script evaluation failed: " + e.getMessage(), e);
             }
             throw createScriptEvaluationException(e.getCause());
         } catch (IOException e) {
@@ -518,7 +518,7 @@ public class ScriptBuilder implements Ex
 
     protected Object runScript() throws ScriptException, IOException {
         checkInitialised();
-        Object result = null;
+        Object result;
         if (compiledScript != null) {
             result = compiledScript.eval();
         } else {

Modified: 
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguage.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguage.java?rev=1071162&r1=1071161&r2=1071162&view=diff
==============================================================================
--- 
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguage.java
 (original)
+++ 
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguage.java
 Wed Feb 16 07:01:33 2011
@@ -40,6 +40,6 @@ public class ScriptLanguage implements L
     }
 
     public boolean isSingleton() {
-        return false;
+        return true;
     }
 }