--- old/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java	2017-06-16 17:01:59.692661659 +0100
+++ new/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java	2017-06-16 17:01:59.620661656 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -25,62 +25,69 @@
 
 package com.sun.tools.internal.ws.resources;
 
+import java.util.Locale;
+import java.util.ResourceBundle;
 import com.sun.istack.internal.localization.Localizable;
 import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
 import com.sun.istack.internal.localization.Localizer;
 
-import java.util.Locale;
-import java.util.ResourceBundle;
-
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
 public final class UtilMessages {
-    private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.util";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, UtilMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
+    private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.util";
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new UtilMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
-    public static Localizable localizableSAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(Object arg0) {
-        return messageFactory.getMessage("sax2dom.notsupported.createelement", arg0);
+    public static Localizable localizableNULL_NAMESPACE_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("null.namespace.found", arg0);
     }
 
     /**
-     * SAX2DOMEx.DomImplDoesntSupportCreateElementNs: {0}
+     * Encountered error in wsdl. Check namespace of element <{0}>
      *
      */
-    public static String SAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(Object arg0) {
-        return localizer.localize(localizableSAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(arg0));
+    public static String NULL_NAMESPACE_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableNULL_NAMESPACE_FOUND(arg0));
     }
 
-    public static Localizable localizableNULL_NAMESPACE_FOUND(Object arg0) {
-        return messageFactory.getMessage("null.namespace.found", arg0);
+    public static Localizable localizableHOLDER_VALUEFIELD_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("holder.valuefield.not.found", arg0);
     }
 
     /**
-     * Encountered error in wsdl. Check namespace of element <{0}>
+     * Could not find the field in the Holder that contains the Holder''s value: {0}
      *
      */
-    public static String NULL_NAMESPACE_FOUND(Object arg0) {
-        return localizer.localize(localizableNULL_NAMESPACE_FOUND(arg0));
+    public static String HOLDER_VALUEFIELD_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableHOLDER_VALUEFIELD_NOT_FOUND(arg0));
     }
 
-    public static Localizable localizableHOLDER_VALUEFIELD_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("holder.valuefield.not.found", arg0);
+    public static Localizable localizableSAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("sax2dom.notsupported.createelement", arg0);
     }
 
     /**
-     * Could not find the field in the Holder that contains the Holder''s value: {0}
+     * SAX2DOMEx.DomImplDoesntSupportCreateElementNs: {0}
      *
      */
-    public static String HOLDER_VALUEFIELD_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableHOLDER_VALUEFIELD_NOT_FOUND(arg0));
+    public static String SAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(Object arg0) {
+        return LOCALIZER.localize(localizableSAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }