Author: lresende
Date: Wed May 20 06:16:23 2009
New Revision: 776575
URL: http://svn.apache.org/viewvc?rev=776575&view=rev
Log:
Removing obsolete FIXME tags, as exceptions are handled ok on wireFormat
interceptor already
Modified:
tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java
Modified:
tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java?rev=776575&r1=776574&r2=776575&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java
Wed May 20 06:16:23 2009
@@ -84,16 +84,6 @@
msg.setBody(args);
responseMessage =
runtimeWire.getInvocationChain(msg.getOperation()).getHeadInvoker().invoke(msg);
} catch (RuntimeException re) {
- //FIXME Exceptions are not handled correctly here
- // They should be reported to the client JavaScript as proper
- // JavaScript exceptions.
-
- //throw new RuntimeException("Error invoking service :" +
re.getMessage(), re);
-
- //FIXME should create a fault message and stuff the JSON Result in
the body of the message
- //JSONRPCResult errorResult = new
JSONRPCResult(JSONRPCResult.CODE_REMOTE_EXCEPTION, id, re);
- //return errorResult.toString().getBytes("UTF-8");
-
Throwable exception = new RuntimeException("Error invoking service
:" + re.getMessage(), re);
return createJSONFaultMessage(re);
}
@@ -114,11 +104,8 @@
}
} else {
//exception thrown while executing the invocation
- //FIXME should create a fault message and stuff the JSON Result in
the body of the message
Throwable exception = (Throwable)responseMessage.getBody();
- return createJSONFaultMessage( exception);
- //JSONRPCResult errorResult = new
JSONRPCResult(JSONRPCResult.CODE_REMOTE_EXCEPTION, id, exception );
- //return errorResult.toString().getBytes("UTF-8");
+ return createJSONFaultMessage(exception);
}
}