dims 2002/06/29 11:05:19
Modified: java/src/org/apache/axis/encoding
DeserializationContextImpl.java
java/src/org/apache/axis/message MessageElement.java
SOAPBody.java SOAPBodyElement.java SOAPHeader.java
SOAPHeaderElement.java
java/src/org/apache/axis/soap SOAPConnectionImpl.java
java/src/org/apache/axis/utils axisNLS.properties
Log:
Throw appropriate exceptions for SAAJ compliance.
Revision Changes Path
1.38 +2 -1
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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- DeserializationContextImpl.java 26 Jun 2002 17:20:47 -0000 1.37
+++ DeserializationContextImpl.java 29 Jun 2002 18:05:19 -0000 1.38
@@ -647,7 +647,8 @@
}
try {
- elem.setParentElement(curElement);
+ if(curElement != null)
+ elem.setParentElement(curElement);
} catch (Exception e) {
/*
* The only checked exception that may be thrown from setParent
1.105 +2 -0 xml-axis/java/src/org/apache/axis/message/MessageElement.java
Index: MessageElement.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/MessageElement.java,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- MessageElement.java 29 Jun 2002 16:19:16 -0000 1.104
+++ MessageElement.java 29 Jun 2002 18:05:19 -0000 1.105
@@ -786,6 +786,8 @@
}
public void setParentElement(SOAPElement parent) throws SOAPException {
+ if(parent == null)
+ throw new
IllegalArgumentException(JavaUtils.getMessage("nullParent00"));
try {
setParent((MessageElement)parent);
} catch (Throwable t) {
1.22 +2 -0 xml-axis/java/src/org/apache/axis/message/SOAPBody.java
Index: SOAPBody.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPBody.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SOAPBody.java 23 Jun 2002 14:25:51 -0000 1.21
+++ SOAPBody.java 29 Jun 2002 18:05:19 -0000 1.22
@@ -104,6 +104,8 @@
}
public void setParentElement(SOAPElement parent) throws SOAPException {
+ if(parent == null)
+ throw new
IllegalArgumentException(JavaUtils.getMessage("nullParent00"));
try {
// cast to force exception if wrong type
super.setParentElement((SOAPEnvelope)parent);
1.16 +2 -0 xml-axis/java/src/org/apache/axis/message/SOAPBodyElement.java
Index: SOAPBodyElement.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPBodyElement.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SOAPBodyElement.java 16 May 2002 12:54:36 -0000 1.15
+++ SOAPBodyElement.java 29 Jun 2002 18:05:19 -0000 1.16
@@ -106,6 +106,8 @@
}
public void setParentElement(SOAPElement parent) throws SOAPException {
+ if(parent == null)
+ throw new
IllegalArgumentException(JavaUtils.getMessage("nullParent00"));
// migration aid
if (parent instanceof SOAPEnvelope) {
log.warn(JavaUtils.getMessage("bodyElementParent"));
1.44 +2 -0 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- SOAPHeader.java 11 Jun 2002 14:53:59 -0000 1.43
+++ SOAPHeader.java 29 Jun 2002 18:05:19 -0000 1.44
@@ -110,6 +110,8 @@
}
public void setParentElement(SOAPElement parent) throws SOAPException {
+ if(parent == null)
+ throw new
IllegalArgumentException(JavaUtils.getMessage("nullParent00"));
try {
// cast to force exception if wrong type
super.setParentElement((SOAPEnvelope)parent);
1.6 +5 -1 xml-axis/java/src/org/apache/axis/message/SOAPHeaderElement.java
Index: SOAPHeaderElement.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPHeaderElement.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SOAPHeaderElement.java 11 Jun 2002 14:53:59 -0000 1.5
+++ SOAPHeaderElement.java 29 Jun 2002 18:05:19 -0000 1.6
@@ -58,6 +58,7 @@
import org.apache.axis.soap.SOAPConstants;
import org.apache.axis.encoding.DeserializationContext;
import org.apache.axis.encoding.SerializationContext;
+import org.apache.axis.utils.JavaUtils;
import org.w3c.dom.Element;
import org.xml.sax.Attributes;
import org.xml.sax.helpers.AttributesImpl;
@@ -112,8 +113,11 @@
}
public void setParentElement(SOAPElement parent) throws SOAPException {
+ if(parent == null)
+ throw new
IllegalArgumentException(JavaUtils.getMessage("nullParent00"));
+ if(!(parent instanceof SOAPHeader))
+ throw new
IllegalArgumentException(JavaUtils.getMessage("illegalArgumentException00"));
try {
- // cast to force exception if wrong type
super.setParentElement((SOAPHeader)parent);
} catch (Throwable t) {
throw new SOAPException(t);
1.4 +6 -1 xml-axis/java/src/org/apache/axis/soap/SOAPConnectionImpl.java
Index: SOAPConnectionImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/soap/SOAPConnectionImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SOAPConnectionImpl.java 11 Jun 2002 17:36:07 -0000 1.3
+++ SOAPConnectionImpl.java 29 Jun 2002 18:05:19 -0000 1.4
@@ -67,6 +67,8 @@
* @author Davanum Srinivas ([EMAIL PROTECTED])
*/
public class SOAPConnectionImpl extends javax.xml.soap.SOAPConnection {
+ boolean closed = false;
+
/**
* Sends the given message to the specified endpoint and
* blocks until it has returned the response.
@@ -100,6 +102,9 @@
* @throws SOAPException if there is a SOAP error
*/
public void close() throws SOAPException {
- //TODO: Flesh this out.
+ if(closed){
+ throw new
SOAPException(org.apache.axis.utils.JavaUtils.getMessage("connectionClosed00"));
+ }
+ closed = true;
}
}
1.19 +2 -0 xml-axis/java/src/org/apache/axis/utils/axisNLS.properties
Index: axisNLS.properties
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/axisNLS.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- axisNLS.properties 28 Jun 2002 18:00:30 -0000 1.18
+++ axisNLS.properties 29 Jun 2002 18:05:19 -0000 1.19
@@ -124,6 +124,8 @@
# NOTE: in createdSSL00, do not translate "SSL"
createdSSL00=Created an SSL connection
+connectionClosed00=Connection closed.
+
debugLevel00=Setting debug level to: {0}
# NOTE: in defaultLogic00, do not translate "AxisServer"
