Author: keith
Date: Sun May 4 05:31:03 2008
New Revision: 16490
Log:
Fixing Mashup-781.
Modified:
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestCallBack.java
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestHostImpl.java
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WebServiceErrorHostObject.java
Modified:
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestCallBack.java
==============================================================================
---
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestCallBack.java
(original)
+++
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestCallBack.java
Sun May 4 05:31:03 2008
@@ -53,13 +53,13 @@
if (ex instanceof AxisFault) {
AxisFault e = (AxisFault) ex;
OMElement detail = e.getDetail();
- if (detail != null)
wsrequest.error.jsSet_details(detail.toString());
+ if (detail != null)
wsrequest.error.jsSet_detail(detail.toString());
QName faultCode = e.getFaultCode();
if (faultCode != null)
wsrequest.error.jsSet_code(faultCode.toString());
wsrequest.error.jsSet_reason(e.getReason());
} else {
Throwable cause = ex.getCause();
- if (cause != null) wsrequest.error.jsSet_details(cause.toString());
+ if (cause != null) wsrequest.error.jsSet_detail(cause.toString());
wsrequest.error.jsSet_code("No SOAP Body.");
wsrequest.error.jsSet_reason(ex.getMessage());
}
Modified:
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestHostImpl.java
==============================================================================
---
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestHostImpl.java
(original)
+++
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestHostImpl.java
Sun May 4 05:31:03 2008
@@ -734,7 +734,7 @@
wsRequest.error = new WebServiceErrorHostObject();
OMElement detail = e.getDetail();
if (detail != null)
- wsRequest.error.jsSet_details(detail.toString());
+ wsRequest.error.jsSet_detail(detail.toString());
QName faultCode = e.getFaultCode();
if (faultCode != null)
wsRequest.error.jsSet_code(faultCode.toString());
@@ -742,7 +742,7 @@
throw e;
} catch (WSSPolicyException e) {
wsRequest.error = new WebServiceErrorHostObject();
- wsRequest.error.jsSet_details(e.getMessage());
+ wsRequest.error.jsSet_detail(e.getMessage());
throw AxisFault.makeFault(e);
}
}
Modified:
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WebServiceErrorHostObject.java
==============================================================================
---
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WebServiceErrorHostObject.java
(original)
+++
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WebServiceErrorHostObject.java
Sun May 4 05:31:03 2008
@@ -28,18 +28,58 @@
String reason;
- String details;
-
- public WebServiceErrorHostObject() {
- super();
- }
+ String detail;
public static Scriptable jsConstructor(Context cx, Object[] args, Function
ctorObj,
boolean inNewExpr) throws
IOException {
- if (args[0] instanceof WebServiceErrorHostObject) {
- return (WebServiceErrorHostObject) args[0];
+ WebServiceErrorHostObject webServiceErrorHostObject = new
WebServiceErrorHostObject();
+ switch (args.length) {
+ case 0:
+ throw Context.reportRuntimeError("INVALID_SYNTAX_EXCEPTION");
+ case 1:
+ if (args[0] instanceof WebServiceErrorHostObject) {
+ return (WebServiceErrorHostObject) args[0];
+ }
+ if (args[0] instanceof String) {
+ webServiceErrorHostObject.reason = (String) args[0];
+ } else {
+ throw
Context.reportRuntimeError("INVALID_SYNTAX_EXCEPTION");
+ }
+ break;
+ case 2:
+ if (args[0] instanceof String) {
+ webServiceErrorHostObject.reason = (String) args[0];
+ } else {
+ throw
Context.reportRuntimeError("INVALID_SYNTAX_EXCEPTION");
+ }
+ if (args[1] instanceof String) {
+ webServiceErrorHostObject.detail = (String) args[1];
+ } else {
+ throw
Context.reportRuntimeError("INVALID_SYNTAX_EXCEPTION");
+ }
+ break;
+ case 3:
+ if (args[0] instanceof String) {
+ webServiceErrorHostObject.reason = (String) args[0];
+ } else {
+ throw
Context.reportRuntimeError("INVALID_SYNTAX_EXCEPTION");
+ }
+ if (args[1] instanceof String) {
+ webServiceErrorHostObject.detail = (String) args[1];
+ } else {
+ throw
Context.reportRuntimeError("INVALID_SYNTAX_EXCEPTION");
+ }
+ if (args[2] instanceof String) {
+ webServiceErrorHostObject.code = (String) args[2];
+ } else {
+ throw
Context.reportRuntimeError("INVALID_SYNTAX_EXCEPTION");
+ }
+ break;
+ default:
+ throw Context.reportRuntimeError("INVALID_SYNTAX_EXCEPTION");
}
- return null;
+
+ return webServiceErrorHostObject;
}
public String getClassName() {
@@ -62,12 +102,11 @@
this.reason = reason;
}
- public String jsGet_details() {
- return details;
+ public String jsGet_detail() {
+ return detail;
}
- public void jsSet_details(String details) {
- this.details = details;
+ public void jsSet_detail(String detail) {
+ this.detail = detail;
}
-
-}
+}
\ No newline at end of file
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
