Mercurial > jdk8-mips64-public > jaxws / file diff

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperParameter.java	Thu Apr 04 19:05:24 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperParameter.java	Tue Apr 09 14:51:13 2013 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -28,6 +28,7 @@
    1.11  import com.sun.xml.internal.ws.api.model.JavaMethod;
    1.12  import com.sun.xml.internal.ws.api.model.ParameterBinding;
    1.13  import com.sun.xml.internal.ws.spi.db.TypeInfo;
    1.14 +import com.sun.xml.internal.ws.spi.db.WrapperComposite;
    1.15  
    1.16  import javax.jws.WebParam.Mode;
    1.17  import java.util.ArrayList;
    1.18 @@ -84,6 +85,7 @@
    1.19       */
    1.20      public void addWrapperChild(ParameterImpl wrapperChild) {
    1.21          wrapperChildren.add(wrapperChild);
    1.22 +        wrapperChild.wrapper = this;
    1.23          // must bind to body. see class javadoc
    1.24          assert wrapperChild.getBinding()== ParameterBinding.BODY;
    1.25      }
    1.26 @@ -95,12 +97,15 @@
    1.27      @Override
    1.28      void fillTypes(List<TypeInfo> types) {
    1.29          super.fillTypes(types);
    1.30 -        if(getParent().getBinding().isRpcLit()) {
    1.31 -            // for rpc/lit, we need to individually marshal/unmarshal wrapped values,
    1.32 -            // so their TypeReference needs to be collected
    1.33 -//            assert getTypeReference().type==CompositeStructure.class;
    1.34 -            for (ParameterImpl p : wrapperChildren)
    1.35 -                p.fillTypes(types);
    1.36 +        if(WrapperComposite.class.equals(getTypeInfo().type)) {
    1.37 +            for (ParameterImpl p : wrapperChildren) p.fillTypes(types);
    1.38          }
    1.39 +//        if(getParent().getBinding().isRpcLit()) {
    1.40 +//            // for rpc/lit, we need to individually marshal/unmarshal wrapped values,
    1.41 +//            // so their TypeReference needs to be collected
    1.42 +////            assert getTypeReference().type==CompositeStructure.class;
    1.43 +//            for (ParameterImpl p : wrapperChildren)
    1.44 +//                p.fillTypes(types);
    1.45 +//        }
    1.46      }
    1.47  }