jdk8-mips64-public/jaxws: comparison src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java

-:8c0b6bccfe47
+:0989ad8c0860
 /*
-* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2013, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 package com.sun.xml.internal.ws.handler;
 import com.sun.xml.internal.ws.api.message.Attachment;
 import com.sun.xml.internal.ws.api.message.AttachmentSet;
 import com.sun.xml.internal.ws.api.message.Packet;
-import com.sun.xml.internal.ws.util.ReadOnlyPropertyException;
 import javax.activation.DataHandler;
 import javax.xml.ws.handler.MessageContext;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 /**
 *
 * @author WS Development Team
 */
 class MessageContextImpl implements MessageContext {
-private Map<String,Object> fallbackMap = null;
+private final Set<String> handlerScopeProps;
-private Set<String> handlerScopeProps;
+private final Packet packet;
-Packet packet;
+private final Map<String, Object> asMapIncludingInvocationProperties;
-void fallback() {
-if(fallbackMap == null) {
-fallbackMap = new HashMap<String,Object>();
-fallbackMap.putAll(packet.createMapView());
-fallbackMap.putAll(packet.invocationProperties);
-}
-}
 /** Creates a new instance of MessageContextImpl */
 public MessageContextImpl(Packet packet) {
 this.packet = packet;
-handlerScopeProps =  packet.getHandlerScopePropertyNames(false);
+this.asMapIncludingInvocationProperties = packet.asMapIncludingInvocationProperties();
+this.handlerScopeProps =  packet.getHandlerScopePropertyNames(false);
 }
 protected void updatePacket() {
 throw new UnsupportedOperationException("wrong call");
 }
 public void setScope(String name, Scope scope) {
 return Scope.APPLICATION;
 }
 }
 public int size() {
-fallback();
+return asMapIncludingInvocationProperties.size();
-return fallbackMap.size();
 }
 public boolean isEmpty() {
-fallback();
+return asMapIncludingInvocationProperties.isEmpty();
-return fallbackMap.isEmpty();
 }
 public boolean containsKey(Object key) {
-if(fallbackMap == null) {
+return asMapIncludingInvocationProperties.containsKey(key);
-if(packet.supports(key))
-return true;
-return packet.invocationProperties.containsKey(key);
-} else {
-fallback();
-return fallbackMap.containsKey(key);
-}
 }
 public boolean containsValue(Object value) {
-fallback();
+return asMapIncludingInvocationProperties.containsValue(value);
-return fallbackMap.containsValue(value);
 }
 public Object put(String key, Object value) {
-if (fallbackMap == null) {
+if (!asMapIncludingInvocationProperties.containsKey(key)) {
-if (packet.supports(key)) {
+//new property, default to Scope.HANDLER
-return packet.put(key, value);     // strongly typed
+handlerScopeProps.add(key);
-}
-if (!packet.invocationProperties.containsKey(key)) {
-//New property, default to Scope.HANDLER
-handlerScopeProps.add(key);
-}
-return packet.invocationProperties.put(key, value);
-} else {
-fallback();
-if (!fallbackMap.containsKey(key)) {
-//new property, default to Scope.HANDLER
-handlerScopeProps.add(key);
-}
-return fallbackMap.put(key, value);
 }
+return asMapIncludingInvocationProperties.put(key, value);
 }
 public Object get(Object key) {
 if(key == null)
 return null;
-Object value;
+Object value = asMapIncludingInvocationProperties.get(key);
-if(fallbackMap == null) {
-if (packet.supports(key)) {
-value =  packet.get(key);    // strongly typed
-} else {
-value = packet.invocationProperties.get(key);
-}
-} else {
-fallback();
-value = fallbackMap.get(key);
-}
 //add the attachments from the Message to the corresponding attachment property
 if(key.equals(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS) ||
 key.equals(MessageContext.INBOUND_MESSAGE_ATTACHMENTS)){
 Map<String, DataHandler> atts = (Map<String, DataHandler>) value;
 if(atts == null)
 atts = new HashMap<String, DataHandler>();
 AttachmentSet attSet = packet.getMessage().getAttachments();
 for(Attachment att : attSet){
-atts.put(att.getContentId(), att.asDataHandler());
+String cid = att.getContentId();
+if (cid.indexOf("@jaxws.sun.com") == -1) {
+Object a = atts.get(cid);
+if (a == null) {
+a = atts.get("<" + cid + ">");
+if (a == null) atts.put(att.getContentId(), att.asDataHandler());
+}
+} else {
+atts.put(att.getContentId(), att.asDataHandler());
+}
 }
 return atts;
 }
 return value;
 }
 public void putAll(Map<? extends String, ? extends Object> t) {
-fallback();
 for(String key: t.keySet()) {
-if(!fallbackMap.containsKey(key)) {
+if(!asMapIncludingInvocationProperties.containsKey(key)) {
 //new property, default to Scope.HANDLER
 handlerScopeProps.add(key);
 }
 }
-fallbackMap.putAll(t);
+asMapIncludingInvocationProperties.putAll(t);
 }
 public void clear() {
-fallback();
+asMapIncludingInvocationProperties.clear();
-fallbackMap.clear();
 }
 public Object remove(Object key){
-fallback();
 handlerScopeProps.remove(key);
-return fallbackMap.remove(key);
+return asMapIncludingInvocationProperties.remove(key);
 }
 public Set<String> keySet() {
-fallback();
+return asMapIncludingInvocationProperties.keySet();
-return fallbackMap.keySet();
 }
 public Set<Map.Entry<String, Object>> entrySet(){
-fallback();
+return asMapIncludingInvocationProperties.entrySet();
-return fallbackMap.entrySet();
 }
 public Collection<Object> values() {
-fallback();
+return asMapIncludingInvocationProperties.values();
-return fallbackMap.values();
 }
-/**
-* Fill a {@link Packet} with values of this {@link MessageContext}.
-*/
-void fill(Packet packet) {
-if(fallbackMap != null) {
-for (Entry<String, Object> entry : fallbackMap.entrySet()) {
-String key = entry.getKey();
-if (packet.supports(key)) {
-try {
-packet.put(key, entry.getValue());
-} catch (ReadOnlyPropertyException e) {
-// Nothing to do
-}
-} else {
-packet.invocationProperties.put(key, entry.getValue());
-}
-}
-//Remove properties which are removed by user.
-packet.createMapView().keySet().retainAll(fallbackMap.keySet());
-packet.invocationProperties.keySet().retainAll(fallbackMap.keySet());
-}
-}
 }

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

comparison: src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java

src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java