cvs commit: xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis WSIFOperation_ApacheAxis.java

[owenb]

owenb       2003/07/22 09:18:32

  Modified:    java/src/org/apache/wsif/providers/soap/apacheaxis
                        WSIFOperation_ApacheAxis.java
  Log:
  Fix for bugzilla 21163 - http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21163
  
  Revision  Changes    Path
  1.86      +5 -5      
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java
  
  Index: WSIFOperation_ApacheAxis.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- WSIFOperation_ApacheAxis.java     3 Apr 2003 16:16:30 -0000       1.85
  +++ WSIFOperation_ApacheAxis.java     22 Jul 2003 16:18:31 -0000      1.86
  @@ -2132,11 +2132,11 @@
                Object serializer = tm.getSerializer();     
                Object deserializer = tm.getDeserializer();
                     
  -             if ( (javaType != null) || (javaType.isAssignableFrom(clazz))
  -             && ( (elementType != null) || (elementType.equals(xmlType)) ) ){
  -                 if (serializer == null || serializer instanceof SerializerFactory
  -                 && deserializer == null || deserializer instanceof 
DeserializerFactory
  -                 && serializer != null || deserializer != null) {
  +             if ( (javaType != null) && (javaType.isAssignableFrom(clazz))
  +             && ( (elementType != null) && (elementType.equals(xmlType)) ) ){
  +                 if ((serializer == null || serializer instanceof SerializerFactory)
  +                 && (deserializer == null || deserializer instanceof 
DeserializerFactory)
  +                 && (serializer != null || deserializer != null)) {
                            return tm;
                    }
               }