dims 2003/05/29 04:59:56
Modified: java/src/org/apache/axis AxisFault.java
java/src/org/apache/axis/client Call.java
java/src/org/apache/axis/message SOAPFault.java
Log:
Cleanup....Remove getWrapped and redundant code.
Revision Changes Path
1.79 +0 -10 xml-axis/java/src/org/apache/axis/AxisFault.java
Index: AxisFault.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/AxisFault.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- AxisFault.java 28 May 2003 23:35:14 -0000 1.78
+++ AxisFault.java 29 May 2003 11:59:56 -0000 1.79
@@ -200,7 +200,6 @@
super ("", target);
// ? SOAP 1.2 or 1.1 ?
setFaultCodeAsString( Constants.FAULT_SERVER_USER );
- detail = target;
initFromException(target);
}
@@ -777,14 +776,5 @@
context.serialize(qname, null, detailObject);
context.setDoMultiRefs(oldMR);
}
- }
-
- /**
- * Returns the wrapped remote exception (the <i>cause</i>).
- *
- * @return the wrapped remote exception, which may be <tt>null</tt>.
- */
- public Throwable getWrapped() {
- return detail;
}
}
1.207 +4 -4 xml-axis/java/src/org/apache/axis/client/Call.java
Index: Call.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Call.java,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- Call.java 28 May 2003 18:34:18 -0000 1.206
+++ Call.java 29 May 2003 11:59:56 -0000 1.207
@@ -1608,8 +1608,8 @@
}
catch (AxisFault af) {
this.operationName = origOpName;
- if(af.getWrapped() != null && af.getWrapped() instanceof
RemoteException) {
- throw ((RemoteException)af.getWrapped());
+ if(af.detail != null && af.detail instanceof RemoteException) {
+ throw ((RemoteException)af.detail);
}
throw af;
}
@@ -1697,8 +1697,8 @@
return res;
}
catch( AxisFault af) {
- if(af.getWrapped() != null && af.getWrapped() instanceof
RemoteException) {
- throw ((RemoteException)af.getWrapped());
+ if(af.detail != null && af.detail instanceof RemoteException) {
+ throw ((RemoteException)af.detail);
}
throw af;
}
1.20 +2 -2 xml-axis/java/src/org/apache/axis/message/SOAPFault.java
Index: SOAPFault.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPFault.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SOAPFault.java 28 May 2003 18:34:18 -0000 1.19
+++ SOAPFault.java 29 May 2003 11:59:56 -0000 1.20
@@ -181,8 +181,8 @@
// get the QName for this faults detail element
QName qname = getFaultQName(fault.getClass(), context);
- if (qname == null && fault.getWrapped() != null) {
- qname = getFaultQName(fault.getWrapped().getClass(), context);
+ if (qname == null && fault.detail != null) {
+ qname = getFaultQName(fault.detail.getClass(), context);
}
if (qname == null) {
// not the greatest, but...
