Merge

Fri, 11 Apr 2014 09:35:28 -0700

author
lana
date
Fri, 11 Apr 2014 09:35:28 -0700
changeset 533
7e20e620dc99
parent 490
e58e1e53a846
parent 532
460225fb335a
child 534
6de45b31d047

Merge

     1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java	Wed Apr 09 08:47:52 2014 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java	Fri Apr 11 09:35:28 2014 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2014, 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 @@ -41,6 +41,7 @@
    1.11  import java.io.ByteArrayInputStream;
    1.12  import java.io.StringReader;
    1.13  import java.io.StringWriter;
    1.14 +import java.nio.charset.StandardCharsets;
    1.15  import java.text.MessageFormat;
    1.16  import java.util.*;
    1.17  
    1.18 @@ -107,7 +108,7 @@
    1.19          }
    1.20          //add w3c EPR binding
    1.21          if(!(options.noAddressingBbinding) && options.target.isLaterThan(Options.Target.V2_1)){
    1.22 -            InputSource is = new InputSource(new ByteArrayInputStream(w3ceprSchemaBinding.getBytes()));
    1.23 +            InputSource is = new InputSource(new ByteArrayInputStream(w3ceprSchemaBinding.getBytes(StandardCharsets.UTF_8)));
    1.24              is.setSystemId(sysId+(++i +1));
    1.25              b.schemas.add(is);
    1.26          }

mercurial