You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/05/22 12:31:19 UTC
svn commit: r540524 - in
/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script:
ScriptImplementation.java ScriptInvoker.java
Author: antelder
Date: Tue May 22 03:31:18 2007
New Revision: 540524
URL: http://svn.apache.org/viewvc?view=rev&rev=540524
Log:
Simplify code by removing unused method and unnecessary try-catch
Modified:
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java?view=diff&rev=540524&r1=540523&r2=540524
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java Tue May 22 03:31:18 2007
@@ -47,8 +47,4 @@
return scriptSrc;
}
- public void setScriptSrc(String scriptSrc) {
- this.scriptSrc = scriptSrc;
- }
-
}
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java?view=diff&rev=540524&r1=540523&r2=540524
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java Tue May 22 03:31:18 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.implementation.script;
-import java.lang.reflect.InvocationTargetException;
-
import javax.script.Invocable;
import javax.script.ScriptException;
@@ -49,31 +47,25 @@
this.operation = operation;
}
- private Object doInvoke(Object[] objects) throws InvocationTargetException {
- try {
-
- if (provider.xmlHelper != null) {
- objects[0] = provider.xmlHelper.toScriptXML((OMElement)objects[0]);
- }
-
- Object response = ((Invocable)provider.scriptEngine).invokeFunction(operation.getName(), objects);
-
- if (provider.xmlHelper != null) {
- response = provider.xmlHelper.toOMElement(response);
- }
-
- return response;
-
- } catch (ScriptException e) {
- throw new InvocationTargetException(e);
+ private Object doInvoke(Object[] objects) throws ScriptException {
+ if (provider.xmlHelper != null) {
+ objects[0] = provider.xmlHelper.toScriptXML((OMElement)objects[0]);
}
+
+ Object response = ((Invocable)provider.scriptEngine).invokeFunction(operation.getName(), objects);
+
+ if (provider.xmlHelper != null) {
+ response = provider.xmlHelper.toOMElement(response);
+ }
+
+ return response;
}
public Message invoke(Message msg) {
try {
Object resp = doInvoke((Object[])msg.getBody());
msg.setBody(resp);
- } catch (InvocationTargetException e) {
+ } catch (ScriptException e) {
msg.setFaultBody(e.getCause());
}
return msg;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org