ws-wsif-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whitl...@apache.org
Subject cvs commit: xml-axis-wsif/java/src/org/apache/wsif/providers/jms JMSMessage.java
Date Thu, 30 Jan 2003 14:28:59 GMT
whitlock    2003/01/30 06:28:59

  Modified:    java/src/org/apache/wsif/providers/jms Tag: pre1_2_0-patches
                        JMSMessage.java
  Log:
  16269: partQName passed to the format handler
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.12.2.2  +37 -32    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.12.2.1
  retrieving revision 1.12.2.2
  diff -u -r1.12.2.1 -r1.12.2.2
  --- JMSMessage.java	30 Oct 2002 16:41:57 -0000	1.12.2.1
  +++ JMSMessage.java	30 Jan 2003 14:28:59 -0000	1.12.2.2
  @@ -218,9 +218,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);
   
  @@ -271,10 +271,11 @@
   
                       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,14 +508,14 @@
                               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);
   
                               message.setText(partText);
                               fh.read(message);
  @@ -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());
  @@ -628,14 +631,14 @@
                               fieldMessageModel.getPart(partName);
                           JMSFormatHandler fh = getFormatHandler(partName);
   
  +                        javax.xml.namespace.QName partQName =
  +                            partModel.getElementName() != null
  +                                ? partModel.getElementName()
  +                                : partModel.getTypeName();
  +
                           if (fh != null) {
  +                            fh.setPartQName(partQName);
   
  -                            fh.setPartQName(
  -                                new javax.xml.namespace.QName(
  -                                    fieldMessageModel
  -                                        .getQName()
  -                                        .getNamespaceURI(),
  -                                    partModel.getName()));
                               // Should be serializable since retrieved it over the wire
                               message.setObject(
                                   (java.io.Serializable) map.get(partName));
  @@ -670,11 +673,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());
  
  
  

Mime
View raw message