--- old/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java 2013-08-13 18:17:59.187869408 +0200 +++ new/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java 2013-08-13 18:17:59.127866751 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, 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 @@ -46,7 +46,7 @@ * @since 2.2.7 */ public class ThreadLocalContainerResolver extends ContainerResolver { - private ThreadLocal containers = new ThreadLocal() { + private ThreadLocal containerThreadLocal = new ThreadLocal() { @Override protected Container initialValue() { return Container.NONE; @@ -54,7 +54,7 @@ }; public Container getContainer() { - return containers.get(); + return containerThreadLocal.get(); } /** @@ -63,8 +63,8 @@ * @return Previous container; must be remembered and passed to exitContainer */ public Container enterContainer(Container container) { - Container old = containers.get(); - containers.set(container); + Container old = containerThreadLocal.get(); + containerThreadLocal.set(container); return old; } @@ -73,7 +73,7 @@ * @param old Container returned from enterContainer */ public void exitContainer(Container old) { - containers.set(old); + containerThreadLocal.set(old); } /**