1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java Thu Apr 04 19:05:24 2013 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java Tue Apr 09 14:51:13 2013 +0100
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2013, 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.istack.internal.NotNull;
1.12 import com.sun.xml.internal.ws.addressing.model.ActionNotSupportedException;
1.13 import com.sun.xml.internal.ws.api.WSBinding;
1.14 +import com.sun.xml.internal.ws.api.message.AddressingUtils;
1.15 import com.sun.xml.internal.ws.api.message.Packet;
1.16 import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
1.17 import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
1.18 @@ -73,8 +74,9 @@
1.19 if (response.getMessage() != null) {
1.20 response = validateInboundHeaders(response);
1.21 response.addSatellite(new WsaPropertyBag(addressingVersion,soapVersion,response));
1.22 - String msgId = response.getMessage().getHeaders().
1.23 - getMessageID(addressingVersion, soapVersion);
1.24 + String msgId = AddressingUtils.
1.25 + getMessageID(response.getMessage().getHeaders(),
1.26 + addressingVersion, soapVersion);
1.27 response.put(WsaPropertyBag.WSA_MSGID_FROM_REQUEST, msgId);
1.28 }
1.29
1.30 @@ -90,7 +92,9 @@
1.31
1.32 if (wbo == null) return;
1.33
1.34 - String gotA = packet.getMessage().getHeaders().getAction(addressingVersion, soapVersion);
1.35 + String gotA = AddressingUtils.getAction(
1.36 + packet.getMessage().getHeaders(),
1.37 + addressingVersion, soapVersion);
1.38 if (gotA == null)
1.39 throw new WebServiceException(AddressingMessages.VALIDATION_CLIENT_NULL_ACTION());
1.40
