# HG changeset patch # User mkos # Date 1396271031 -7200 # Mon Mar 31 15:03:51 2014 +0200 # Node ID f223680b5f5d25b43a70c47c8ad61d673de74101 # Parent d03dd22762db2705a6c6c10f61403340df4bac7c 8038307: JAX-WS conformance tests fail when running JCK-devtools-8 suite against RI in EBCDIC emulation mode diff --git a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,6 +41,7 @@ import java.io.ByteArrayInputStream; import java.io.StringReader; import java.io.StringWriter; +import java.io.UnsupportedEncodingException; import java.text.MessageFormat; import java.util.*; @@ -107,7 +108,7 @@ } //add w3c EPR binding if(!(options.noAddressingBbinding) && options.target.isLaterThan(Options.Target.V2_1)){ - InputSource is = new InputSource(new ByteArrayInputStream(w3ceprSchemaBinding.getBytes())); + InputSource is = new InputSource(new ByteArrayInputStream(getUTF8Bytes(w3ceprSchemaBinding))); is.setSystemId(sysId+(++i +1)); b.schemas.add(is); } @@ -122,6 +123,15 @@ return b.schemas; } + private static byte[] getUTF8Bytes(String w3ceprSchemaBinding1) { + try { + return w3ceprSchemaBinding1.getBytes("UTF-8"); + } catch (UnsupportedEncodingException unexpected) { + // should never happen + throw new IllegalStateException(unexpected); + } + } + private PseudoSchemaBuilder(WSDLDocument _wsdl) { this.wsdlDocument = _wsdl;