--- old/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java	2017-03-10 23:57:07.370242880 +0300
+++ new/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java	2017-03-10 23:57:07.266243328 +0300
@@ -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,30 +25,40 @@
 
 package com.sun.xml.internal.ws.resources;
 
+import java.util.Locale;
+import java.util.ResourceBundle;
+import javax.annotation.Generated;
 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
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class ProviderApiMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.providerApi";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, ProviderApiMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ProviderApiMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+    public static Localizable localizableNULL_SERVICE() {
+        return MESSAGE_FACTORY.getMessage("null.service");
+    }
+
+    /**
+     * serviceName can't be null when portName is specified
+     *
+     */
+    public static String NULL_SERVICE() {
+        return LOCALIZER.localize(localizableNULL_SERVICE());
     }
 
     public static Localizable localizableNULL_ADDRESS_SERVICE_ENDPOINT() {
-        return messageFactory.getMessage("null.address.service.endpoint");
+        return MESSAGE_FACTORY.getMessage("null.address.service.endpoint");
     }
 
     /**
@@ -56,59 +66,59 @@
      *
      */
     public static String NULL_ADDRESS_SERVICE_ENDPOINT() {
-        return localizer.localize(localizableNULL_ADDRESS_SERVICE_ENDPOINT());
+        return LOCALIZER.localize(localizableNULL_ADDRESS_SERVICE_ENDPOINT());
     }
 
-    public static Localizable localizableNO_WSDL_NO_PORT(Object arg0) {
-        return messageFactory.getMessage("no.wsdl.no.port", arg0);
+    public static Localizable localizableNULL_PORTNAME() {
+        return MESSAGE_FACTORY.getMessage("null.portname");
     }
 
     /**
-     * WSDL Metadata not available to create the proxy, either Service instance or ServiceEndpointInterface {0} should have WSDL information
+     * EPR doesn't have EndpointName in the Metadata
      *
      */
-    public static String NO_WSDL_NO_PORT(Object arg0) {
-        return localizer.localize(localizableNO_WSDL_NO_PORT(arg0));
+    public static String NULL_PORTNAME() {
+        return LOCALIZER.localize(localizableNULL_PORTNAME());
     }
 
-    public static Localizable localizableNULL_SERVICE() {
-        return messageFactory.getMessage("null.service");
+    public static Localizable localizableNULL_WSDL() {
+        return MESSAGE_FACTORY.getMessage("null.wsdl");
     }
 
     /**
-     * serviceName can't be null when portName is specified
+     * EPR doesn't have WSDL Metadata which is needed for the current operation
      *
      */
-    public static String NULL_SERVICE() {
-        return localizer.localize(localizableNULL_SERVICE());
+    public static String NULL_WSDL() {
+        return LOCALIZER.localize(localizableNULL_WSDL());
     }
 
-    public static Localizable localizableNULL_ADDRESS() {
-        return messageFactory.getMessage("null.address");
+    public static Localizable localizableNO_WSDL_NO_PORT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("no.wsdl.no.port", arg0);
     }
 
     /**
-     * Address in an EPR cannot be null
+     * WSDL Metadata not available to create the proxy, either Service instance or ServiceEndpointInterface {0} should have WSDL information
      *
      */
-    public static String NULL_ADDRESS() {
-        return localizer.localize(localizableNULL_ADDRESS());
+    public static String NO_WSDL_NO_PORT(Object arg0) {
+        return LOCALIZER.localize(localizableNO_WSDL_NO_PORT(arg0));
     }
 
-    public static Localizable localizableNULL_PORTNAME() {
-        return messageFactory.getMessage("null.portname");
+    public static Localizable localizableNOTFOUND_PORT_IN_WSDL(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("notfound.port.in.wsdl", arg0, arg1, arg2);
     }
 
     /**
-     * EPR doesn't have EndpointName in the Metadata
+     * Port: {0} not a valid port in Service: {1} in WSDL: {2}
      *
      */
-    public static String NULL_PORTNAME() {
-        return localizer.localize(localizableNULL_PORTNAME());
+    public static String NOTFOUND_PORT_IN_WSDL(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableNOTFOUND_PORT_IN_WSDL(arg0, arg1, arg2));
     }
 
     public static Localizable localizableNOTFOUND_SERVICE_IN_WSDL(Object arg0, Object arg1) {
-        return messageFactory.getMessage("notfound.service.in.wsdl", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("notfound.service.in.wsdl", arg0, arg1);
     }
 
     /**
@@ -116,11 +126,11 @@
      *
      */
     public static String NOTFOUND_SERVICE_IN_WSDL(Object arg0, Object arg1) {
-        return localizer.localize(localizableNOTFOUND_SERVICE_IN_WSDL(arg0, arg1));
+        return LOCALIZER.localize(localizableNOTFOUND_SERVICE_IN_WSDL(arg0, arg1));
     }
 
     public static Localizable localizableNULL_EPR() {
-        return messageFactory.getMessage("null.epr");
+        return MESSAGE_FACTORY.getMessage("null.epr");
     }
 
     /**
@@ -128,35 +138,23 @@
      *
      */
     public static String NULL_EPR() {
-        return localizer.localize(localizableNULL_EPR());
+        return LOCALIZER.localize(localizableNULL_EPR());
     }
 
-    public static Localizable localizableNULL_WSDL() {
-        return messageFactory.getMessage("null.wsdl");
-    }
-
-    /**
-     * EPR doesn't have WSDL Metadata which is needed for the current operation
-     *
-     */
-    public static String NULL_WSDL() {
-        return localizer.localize(localizableNULL_WSDL());
-    }
-
-    public static Localizable localizableNOTFOUND_PORT_IN_WSDL(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("notfound.port.in.wsdl", arg0, arg1, arg2);
+    public static Localizable localizableNULL_ADDRESS() {
+        return MESSAGE_FACTORY.getMessage("null.address");
     }
 
     /**
-     * Port: {0} not a valid port in Service: {1} in WSDL: {2}
+     * Address in an EPR cannot be null
      *
      */
-    public static String NOTFOUND_PORT_IN_WSDL(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableNOTFOUND_PORT_IN_WSDL(arg0, arg1, arg2));
+    public static String NULL_ADDRESS() {
+        return LOCALIZER.localize(localizableNULL_ADDRESS());
     }
 
     public static Localizable localizableERROR_WSDL(Object arg0) {
-        return messageFactory.getMessage("error.wsdl", arg0);
+        return MESSAGE_FACTORY.getMessage("error.wsdl", arg0);
     }
 
     /**
@@ -164,7 +162,18 @@
      *
      */
     public static String ERROR_WSDL(Object arg0) {
-        return localizer.localize(localizableERROR_WSDL(arg0));
+        return LOCALIZER.localize(localizableERROR_WSDL(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }