You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsif-dev@ws.apache.org by wh...@apache.org on 2003/01/30 15:24:44 UTC
cvs commit: xml-axis-wsif/java/src/org/apache/wsif/providers/jms JMSMessage.java
whitlock 2003/01/30 06:24:44
Modified: java/src/org/apache/wsif/providers/jms JMSMessage.java
Log:
16269: partQName passed to the format handler
Revision Changes Path
1.16 +42 -37 xml-axis-wsif/java/src/org/apache/wsif/providers/jms/JMSMessage.java
Index: JMSMessage.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/jms/JMSMessage.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JMSMessage.java 7 Dec 2002 12:33:54 -0000 1.15
+++ JMSMessage.java 30 Jan 2003 14:24:44 -0000 1.16
@@ -218,10 +218,10 @@
javax.wsdl.Part partModel = fieldMessageModel.getPart(partName);
javax.xml.namespace.QName partQName =
- new javax.xml.namespace.QName(
- fieldMessageModel.getQName().getNamespaceURI(),
- partModel.getName());
-
+ partModel.getElementName() != null
+ ? partModel.getElementName()
+ : partModel.getTypeName();
+
JMSFormatHandler fh = getFormatHandler(partName);
if (fh != null) {
@@ -271,11 +271,12 @@
javax.wsdl.Part partModel =
fieldMessageModel.getPart(partName);
+
javax.xml.namespace.QName partQName =
- new javax.xml.namespace.QName(
- fieldMessageModel.getQName().getNamespaceURI(),
- partModel.getName());
-
+ partModel.getElementName() != null
+ ? partModel.getElementName()
+ : partModel.getTypeName();
+
// Determine the format handler
JMSFormatHandler fh = getFormatHandler(partName);
@@ -351,9 +352,9 @@
javax.wsdl.Part partModel = fieldMessageModel.getPart(partName);
javax.xml.namespace.QName partQName =
- new javax.xml.namespace.QName(
- fieldMessageModel.getQName().getNamespaceURI(),
- partModel.getName());
+ partModel.getElementName() != null
+ ? partModel.getElementName()
+ : partModel.getTypeName();
JMSFormatHandler fh = getFormatHandler(partName);
@@ -383,9 +384,9 @@
fieldMessageModel.getPart(partName);
javax.xml.namespace.QName partQName =
- new javax.xml.namespace.QName(
- fieldMessageModel.getQName().getNamespaceURI(),
- partModel.getName());
+ partModel.getElementName() != null
+ ? partModel.getElementName()
+ : partModel.getTypeName();
JMSFormatHandler fh = getFormatHandler(partName);
@@ -507,15 +508,15 @@
fieldMessageModel.getPart(partName);
JMSFormatHandler fh = getFormatHandler(partName);
- if (fh != null) {
+ javax.xml.namespace.QName partQName =
+ partModel.getElementName() != null
+ ? partModel.getElementName()
+ : partModel.getTypeName();
- fh.setPartQName(
- new javax.xml.namespace.QName(
- fieldMessageModel
- .getQName()
- .getNamespaceURI(),
- partModel.getName()));
+ if (fh != null) {
+ fh.setPartQName(partQName);
+
message.setText(partText);
fh.read(message);
//fh.setObjectPart(n);
@@ -566,11 +567,13 @@
javax.wsdl.Part partModel = fieldMessageModel.getPart(partName);
JMSFormatHandler fh = getFormatHandler(partName);
+ javax.xml.namespace.QName partQName =
+ partModel.getElementName() != null
+ ? partModel.getElementName()
+ : partModel.getTypeName();
+
if (fh != null) {
- fh.setPartQName(
- new javax.xml.namespace.QName(
- fieldMessageModel.getQName().getNamespaceURI(),
- partModel.getName()));
+ fh.setPartQName(partQName);
fh.read(message);
setObjectPart(partName, fh.getObjectPart());
@@ -627,14 +630,14 @@
fieldMessageModel.getPart(partName);
JMSFormatHandler fh = getFormatHandler(partName);
- if (fh != null) {
+ javax.xml.namespace.QName partQName =
+ partModel.getElementName() != null
+ ? partModel.getElementName()
+ : partModel.getTypeName();
- fh.setPartQName(
- new javax.xml.namespace.QName(
- fieldMessageModel
- .getQName()
- .getNamespaceURI(),
- partModel.getName()));
+ if (fh != null) {
+ fh.setPartQName(partQName);
+
// Should be serializable since retrieved it over the wire
message.setObject(
(java.io.Serializable) map.get(partName));
@@ -671,11 +674,13 @@
javax.wsdl.Part partModel = fieldMessageModel.getPart(partName);
JMSFormatHandler fh = getFormatHandler(partName);
+ javax.xml.namespace.QName partQName =
+ partModel.getElementName() != null
+ ? partModel.getElementName()
+ : partModel.getTypeName();
+
if (fh != null) {
- fh.setPartQName(
- new javax.xml.namespace.QName(
- fieldMessageModel.getQName().getNamespaceURI(),
- partModel.getName()));
+ fh.setPartQName(partQName);
fh.read(message);
setObjectPart(partName, fh.getObjectPart());
@@ -823,4 +828,4 @@
Trc.exit(result);
return result;
}
-}
\ No newline at end of file
+}