1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java Thu Apr 04 19:05:24 2013 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.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 @@ -25,11 +25,12 @@
1.11
1.12 package com.sun.xml.internal.ws.addressing;
1.13
1.14 +import com.oracle.webservices.internal.api.message.BasePropertySet;
1.15 import com.sun.istack.internal.NotNull;
1.16 -import com.sun.xml.internal.ws.api.PropertySet;
1.17 import com.sun.xml.internal.ws.api.SOAPVersion;
1.18 import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
1.19 import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
1.20 +import com.sun.xml.internal.ws.api.message.AddressingUtils;
1.21 import com.sun.xml.internal.ws.api.message.Header;
1.22 import com.sun.xml.internal.ws.api.message.Message;
1.23 import com.sun.xml.internal.ws.api.message.Packet;
1.24 @@ -38,6 +39,7 @@
1.25 import javax.xml.namespace.QName;
1.26 import javax.xml.stream.XMLStreamException;
1.27
1.28 +
1.29 /**
1.30 * Provides access to the Addressing headers.
1.31 *
1.32 @@ -45,7 +47,7 @@
1.33 * @author Rama Pulavarthi
1.34 * @since 2.1.3
1.35 */
1.36 -public class WsaPropertyBag extends PropertySet {
1.37 +public class WsaPropertyBag extends BasePropertySet {
1.38
1.39 public static final String WSA_REPLYTO_FROM_REQUEST = "com.sun.xml.internal.ws.addressing.WsaPropertyBag.ReplyToFromRequest";
1.40 public static final String WSA_FAULTTO_FROM_REQUEST = "com.sun.xml.internal.ws.addressing.WsaPropertyBag.FaultToFromRequest";
1.41 @@ -137,7 +139,7 @@
1.42 if (packet.getMessage() == null) {
1.43 return null;
1.44 }
1.45 - return packet.getMessage().getHeaders().getMessageID(addressingVersion,soapVersion);
1.46 + return AddressingUtils.getMessageID(packet.getMessage().getHeaders(), addressingVersion,soapVersion);
1.47 }
1.48
1.49 private WSEndpointReference getEPR(QName tag) throws XMLStreamException {
