glyn 02/04/12 02:46:36
Modified: java/samples/echo echoHeaderStringHandler.java
echoHeaderStructHandler.java
java/samples/encoding TestSer.java
java/src/org/apache/axis SOAPPart.java
java/src/org/apache/axis/client Call.java
java/src/org/apache/axis/encoding
DeserializationContextImpl.java
java/src/org/apache/axis/handlers SimpleSessionHandler.java
java/src/org/apache/axis/handlers/soap SOAPService.java
java/src/org/apache/axis/message EnvelopeBuilder.java
HeaderBuilder.java SOAPEnvelope.java
SOAPHeader.java
java/test/RPCDispatch TestRPC.java
java/test/outparams ServiceHandler.java
Log:
Remove unnecessary exception throwing from addHeader and some constructors.
Revision Changes Path
1.5 +1 -5 xml-axis/java/samples/echo/echoHeaderStringHandler.java
Index: echoHeaderStringHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/echo/echoHeaderStringHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- echoHeaderStringHandler.java 11 Apr 2002 15:50:39 -0000 1.4
+++ echoHeaderStringHandler.java 12 Apr 2002 09:46:35 -0000 1.5
@@ -103,11 +103,7 @@
SOAPHeaderElement header = new SOAPHeaderElement(HEADER_NS,
HEADER_RESNAME,
strVal);
- try {
- env.addHeader(header);
- } catch (Exception ex) {
- throw AxisFault.makeFault(ex);
- }
+ env.addHeader(header);
} else {
// Request. look for the header
Message msg = context.getRequestMessage();
1.5 +1 -5 xml-axis/java/samples/echo/echoHeaderStructHandler.java
Index: echoHeaderStructHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/echo/echoHeaderStructHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- echoHeaderStructHandler.java 11 Apr 2002 15:50:39 -0000 1.4
+++ echoHeaderStructHandler.java 12 Apr 2002 09:46:35 -0000 1.5
@@ -107,11 +107,7 @@
SOAPHeaderElement header = new SOAPHeaderElement(HEADER_NS,
HEADER_RESNAME,
hdrVal);
- try {
- env.addHeader(header);
- } catch (Exception ex) {
- throw AxisFault.makeFault(ex);
- }
+ env.addHeader(header);
} else {
// Request. look for the header
Message msg = context.getRequestMessage();
1.22 +19 -23 xml-axis/java/samples/encoding/TestSer.java
Index: TestSer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/encoding/TestSer.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TestSer.java 11 Apr 2002 15:50:39 -0000 1.21
+++ TestSer.java 12 Apr 2002 09:46:35 -0000 1.22
@@ -28,30 +28,26 @@
public static final String myNS = "urn:myNS";
public static void main(String args[]) {
+ MessageContext msgContext = new MessageContext(new AxisServer());
+ SOAPEnvelope msg = new SOAPEnvelope();
+ RPCParam arg1 = new RPCParam("urn:myNamespace", "testParam", "this is a
string");
+ QName dataQName = new QName("typeNS", "Data");
+
+ Data data = new Data();
+ Data data2 = new Data();
+ data.stringMember = "String member";
+ data.floatMember = new Float("1.23");
+ data.dataMember = data2;
+
+ data2.stringMember = "another str member";
+ data2.floatMember = new Float("4.56");
+ data2.dataMember = null; // "data;" for loop-test of multi-refs
+
+ RPCParam arg2 = new RPCParam("", "struct", data);
+ RPCElement body = new RPCElement("urn:myNamespace", "method1", new
Object[]{ arg1, arg2 });
+ msg.addBodyElement(body);
+
try {
- MessageContext msgContext = new MessageContext(new AxisServer());
- SOAPEnvelope msg = new SOAPEnvelope();
- RPCParam arg1 = new RPCParam("urn:myNamespace",
- "testParam",
- "this is a string");
- QName dataQName = new QName("typeNS", "Data");
-
- Data data = new Data();
- Data data2 = new Data();
- data.stringMember = "String member";
- data.floatMember = new Float("1.23");
- data.dataMember = data2;
-
- data2.stringMember = "another str member";
- data2.floatMember = new Float("4.56");
- data2.dataMember = null; // "data;" for loop-test of multi-refs
-
- RPCParam arg2 = new RPCParam("", "struct", data);
- RPCElement body = new RPCElement("urn:myNamespace",
- "method1",
- new Object[]{ arg1, arg2 });
- msg.addBodyElement(body);
-
Reader reader = null;
if (args.length == 0) {
1.19 +3 -19 xml-axis/java/src/org/apache/axis/SOAPPart.java
Index: SOAPPart.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/SOAPPart.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SOAPPart.java 11 Apr 2002 15:50:39 -0000 1.18
+++ SOAPPart.java 12 Apr 2002 09:46:35 -0000 1.19
@@ -66,8 +66,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.soap.SOAPException;
-
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -409,12 +407,7 @@
if (currentForm == FORM_BODYINSTREAM) {
InputStreamBody bodyEl =
new InputStreamBody((InputStream)currentMessage);
- SOAPEnvelope env;
- try {
- env = new SOAPEnvelope();
- } catch (SOAPException ex) {
- throw new AxisFault(ex);
- }
+ SOAPEnvelope env = new SOAPEnvelope();
env.addBodyElement(bodyEl);
setCurrentMessage(env, FORM_SOAPENVELOPE);
return env;
@@ -427,17 +420,8 @@
} else {
is = new InputSource(new StringReader(getAsString()));
}
-
- DeserializationContext dser;
- try {
- dser = new DeserializationContextImpl(is,
- getMessage().
- getMessageContext(),
- getMessage().
- getMessageType());
- } catch (Exception ex) {
- throw AxisFault.makeFault(ex);
- }
+ DeserializationContext dser =
+ new DeserializationContextImpl(is, getMessage().getMessageContext(),
getMessage().getMessageType());
// This may throw a SAXException
try {
1.114 +24 -31 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.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- Call.java 11 Apr 2002 15:50:39 -0000 1.113
+++ Call.java 12 Apr 2002 09:46:35 -0000 1.114
@@ -1144,20 +1144,16 @@
if ( !(params[i] instanceof SOAPBodyElement) ) break ;
if ( params != null && params.length > 0 && i == params.length ) {
- try {
- /* ok, we're doing Messaging, so build up the message */
- /******************************************************/
- env = new SOAPEnvelope();
-
- for ( i = 0 ; myHeaders != null && i < myHeaders.size() ; i++ )
- env.addHeader((SOAPHeaderElement)myHeaders.get(i));
-
- if ( !(params[0] instanceof SOAPEnvelope) )
- for ( i = 0 ; i < params.length ; i++ )
- env.addBodyElement( (SOAPBodyElement) params[i] );
- } catch (Exception ex) {
- throw AxisFault.makeFault(ex);
- }
+ /* ok, we're doing Messaging, so build up the message */
+ /******************************************************/
+ env = new SOAPEnvelope();
+
+ for ( i = 0 ; myHeaders != null && i < myHeaders.size() ; i++ )
+ env.addHeader((SOAPHeaderElement)myHeaders.get(i));
+
+ if ( !(params[0] instanceof SOAPEnvelope) )
+ for ( i = 0 ; i < params.length ; i++ )
+ env.addBodyElement( (SOAPBodyElement) params[i] );
Message msg = new Message( env );
setRequestMessage(msg);
@@ -1658,29 +1654,26 @@
throw new AxisFault(JavaUtils.getMessage("mustSpecifyReturnType"));
}
- SOAPEnvelope reqEnv;
+ SOAPEnvelope reqEnv = new SOAPEnvelope();
SOAPEnvelope resEnv = null ;
- Message reqMsg;
+ Message reqMsg = new Message( reqEnv );
Message resMsg = null ;
Vector resArgs = null ;
Object result = null ;
- try {
- reqEnv = new SOAPEnvelope();
- reqMsg = new Message( reqEnv );
-
- // Clear the output params
- outParams = new HashMap();
- outParamsList = new ArrayList();
-
- // If we have headers to insert, do so now.
- if (myHeaders != null) {
- for (int i = 0; i < myHeaders.size(); i++) {
- reqEnv.addHeader((SOAPHeaderElement)myHeaders.get(i));
- }
+ // Clear the output params
+ outParams = new HashMap();
+ outParamsList = new ArrayList();
+
+ // If we have headers to insert, do so now.
+ if (myHeaders != null) {
+ for (int i = 0; i < myHeaders.size(); i++) {
+ reqEnv.addHeader((SOAPHeaderElement)myHeaders.get(i));
}
-
- // Set both the envelope and the RPCElement encoding styles
+ }
+
+ // Set both the envelope and the RPCElement encoding styles
+ try {
body.setEncodingStyle(encodingStyle);
reqEnv.setEncodingStyle(encodingStyle);
1.23 +1 -2
xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java
Index: DeserializationContextImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DeserializationContextImpl.java 11 Apr 2002 15:50:40 -0000 1.22
+++ DeserializationContextImpl.java 12 Apr 2002 09:46:36 -0000 1.23
@@ -85,7 +85,6 @@
import javax.xml.parsers.SAXParser;
import javax.xml.rpc.namespace.QName;
import javax.xml.rpc.JAXRPCException;
-import javax.xml.soap.SOAPException;
import java.io.IOException;
import java.util.ArrayList;
@@ -155,7 +154,7 @@
* @param messageType is the MessageType to construct an EnvelopeBuilder
*/
public DeserializationContextImpl(InputSource is, MessageContext ctx,
- String messageType) throws SOAPException
+ String messageType)
{
EnvelopeBuilder builder = new EnvelopeBuilder(messageType,
ctx.getSOAPConstants());
1.19 +2 -10
xml-axis/java/src/org/apache/axis/handlers/SimpleSessionHandler.java
Index: SimpleSessionHandler.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/handlers/SimpleSessionHandler.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SimpleSessionHandler.java 11 Apr 2002 15:50:40 -0000 1.18
+++ SimpleSessionHandler.java 12 Apr 2002 09:46:36 -0000 1.19
@@ -224,11 +224,7 @@
SOAPHeaderElement header = new SOAPHeaderElement(SESSION_NS,
SESSION_LOCALPART,
id);
- try {
- env.addHeader(header);
- } catch (Exception ex) {
- throw AxisFault.makeFault(ex);
- }
+ env.addHeader(header);
}
}
@@ -251,11 +247,7 @@
SOAPHeaderElement header = new SOAPHeaderElement(SESSION_NS,
SESSION_LOCALPART,
id);
- try {
- env.addHeader(header);
- } catch (Exception ex) {
- throw AxisFault.makeFault(ex);
- }
+ env.addHeader(header);
} else {
// Request. Set up the session if we find the header.
Message msg = context.getRequestMessage();
1.56 +3 -10 xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java
Index: SOAPService.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- SOAPService.java 11 Apr 2002 15:50:40 -0000 1.55
+++ SOAPService.java 12 Apr 2002 09:46:36 -0000 1.56
@@ -163,11 +163,7 @@
if (doMisunderstoodHeaders) {
Message respMsg = msgContext.getResponseMessage();
if (respMsg == null) {
- try {
- respMsg = new Message(new SOAPEnvelope());
- } catch (Exception ex) {
- throw AxisFault.makeFault(ex);
- }
+ respMsg = new Message(new SOAPEnvelope());
msgContext.setResponseMessage(respMsg);
}
env = respMsg.getSOAPEnvelope();
@@ -183,11 +179,8 @@
newHeader.addAttribute(null,
Constants.ATTR_QNAME,
badQName);
- try {
- env.addHeader(newHeader);
- } catch (Exception ex) {
- throw AxisFault.makeFault(ex);
- }
+
+ env.addHeader(newHeader);
}
}
1.17 +0 -2 xml-axis/java/src/org/apache/axis/message/EnvelopeBuilder.java
Index: EnvelopeBuilder.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/EnvelopeBuilder.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- EnvelopeBuilder.java 11 Apr 2002 15:50:40 -0000 1.16
+++ EnvelopeBuilder.java 12 Apr 2002 09:46:36 -0000 1.17
@@ -62,7 +62,6 @@
import org.xml.sax.SAXException;
import javax.xml.rpc.namespace.QName;
-import javax.xml.soap.SOAPException;
/**
* The EnvelopeBuilder is responsible for parsing the top-level
@@ -80,7 +79,6 @@
private boolean gotBody = false;
public EnvelopeBuilder(String messageType, SOAPConstants soapConstants)
- throws SOAPException
{
envelope = new SOAPEnvelope(false, soapConstants);
envelope.setMessageType(messageType);
1.9 +1 -6 xml-axis/java/src/org/apache/axis/message/HeaderBuilder.java
Index: HeaderBuilder.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/HeaderBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HeaderBuilder.java 11 Apr 2002 15:50:40 -0000 1.8
+++ HeaderBuilder.java 12 Apr 2002 09:46:36 -0000 1.9
@@ -92,12 +92,7 @@
public void onEndChild(String namespace, String localName,
DeserializationContext context)
- throws SAXException
{
- try {
- envelope.addHeader(header);
- } catch (Exception ex) {
- throw new SAXException(ex);
- }
+ envelope.addHeader(header);
}
}
1.64 +4 -6 xml-axis/java/src/org/apache/axis/message/SOAPEnvelope.java
Index: SOAPEnvelope.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPEnvelope.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- SOAPEnvelope.java 11 Apr 2002 15:50:40 -0000 1.63
+++ SOAPEnvelope.java 12 Apr 2002 09:46:36 -0000 1.64
@@ -75,7 +75,6 @@
import org.xml.sax.helpers.AttributesImpl;
import javax.xml.rpc.namespace.QName;
-import javax.xml.soap.SOAPException;
import java.io.InputStream;
import java.util.ArrayList;
@@ -102,18 +101,17 @@
// deserialization
public String messageType;
- public SOAPEnvelope() throws SOAPException
+ public SOAPEnvelope()
{
this(true, SOAPConstants.SOAP11_CONSTANTS);
}
- public SOAPEnvelope(SOAPConstants soapConstants) throws SOAPException
+ public SOAPEnvelope(SOAPConstants soapConstants)
{
this(true, soapConstants);
}
public SOAPEnvelope(boolean registerPrefixes, SOAPConstants soapConstants)
- throws SOAPException
{
this.soapConstants = soapConstants;
header = new SOAPHeader(this, soapConstants);
@@ -133,7 +131,7 @@
setDirty(true);
}
- public SOAPEnvelope(InputStream input) throws SAXException, SOAPException {
+ public SOAPEnvelope(InputStream input) throws SAXException {
InputSource is = new InputSource(input);
header = new SOAPHeader(this, soapConstants); // soapConstants = null!
DeserializationContext dser = null ;
@@ -193,7 +191,7 @@
}
}
- public void addHeader(SOAPHeaderElement hdr) throws SOAPException
+ public void addHeader(SOAPHeaderElement hdr)
{
if (header == null) {
header = new SOAPHeader(this, soapConstants);
1.40 +7 -3 xml-axis/java/src/org/apache/axis/message/SOAPHeader.java
Index: SOAPHeader.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPHeader.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- SOAPHeader.java 11 Apr 2002 15:50:40 -0000 1.39
+++ SOAPHeader.java 12 Apr 2002 09:46:36 -0000 1.40
@@ -89,10 +89,14 @@
private SOAPConstants soapConstants;
- SOAPHeader(SOAPEnvelope env, SOAPConstants soapConsts)
- throws SOAPException {
+ SOAPHeader(SOAPEnvelope env, SOAPConstants soapConsts) {
soapConstants = soapConsts;
- setParentElement(env);
+ try {
+ setParentElement(env);
+ } catch (SOAPException ex) {
+ // class cast should never fail when parent is a SOAPEnvelope
+ log.fatal(JavaUtils.getMessage("exception00"), ex);
+ }
}
public void setParentElement(SOAPElement parent) throws SOAPException {
1.36 +1 -2 xml-axis/java/test/RPCDispatch/TestRPC.java
Index: TestRPC.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/RPCDispatch/TestRPC.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- TestRPC.java 11 Apr 2002 15:50:40 -0000 1.35
+++ TestRPC.java 12 Apr 2002 09:46:36 -0000 1.36
@@ -22,7 +22,6 @@
import org.w3c.dom.Text;
import javax.xml.rpc.namespace.QName;
-import javax.xml.soap.SOAPException;
import java.util.Vector;
/**
@@ -62,7 +61,7 @@
* @return Deserialized result
*/
private final Object rpc(String method, Object[] parms)
- throws AxisFault, SAXException, SOAPException
+ throws AxisFault, SAXException
{
// Create the message context
1.9 +1 -6 xml-axis/java/test/outparams/ServiceHandler.java
Index: ServiceHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/outparams/ServiceHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServiceHandler.java 11 Apr 2002 15:50:40 -0000 1.8
+++ ServiceHandler.java 12 Apr 2002 09:46:36 -0000 1.9
@@ -69,12 +69,7 @@
public static final Integer RESPONSE = new Integer(5);
public void invoke(MessageContext msgContext) throws AxisFault {
- SOAPEnvelope env;
- try {
- env = new SOAPEnvelope();
- } catch (Exception ex) {
- throw AxisFault.makeFault(ex);
- }
+ SOAPEnvelope env = new SOAPEnvelope();
RPCParam retVal = new RPCParam("return", RESPONSE);
RPCParam outParam1 = new RPCParam("out1", OUTPARAM1);
