--- old/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java	2017-05-03 18:06:08.999094455 +0300
+++ new/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java	2017-05-03 18:06:08.863094459 +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,28 @@
 
 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 WsdlmodelMessages {
-    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.wsdlmodel";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, WsdlmodelMessages::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.xml.internal.ws.resources.wsdlmodel";
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new WsdlmodelMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableWSDL_PORTADDRESS_EPRADDRESS_NOT_MATCH(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsdl.portaddress.epraddress.not.match", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("wsdl.portaddress.epraddress.not.match", arg0, arg1, arg2);
     }
 
     /**
@@ -56,11 +54,11 @@
      *
      */
     public static String WSDL_PORTADDRESS_EPRADDRESS_NOT_MATCH(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSDL_PORTADDRESS_EPRADDRESS_NOT_MATCH(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableWSDL_PORTADDRESS_EPRADDRESS_NOT_MATCH(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWSDL_IMPORT_SHOULD_BE_WSDL(Object arg0) {
-        return messageFactory.getMessage("wsdl.import.should.be.wsdl", arg0);
+        return MESSAGE_FACTORY.getMessage("wsdl.import.should.be.wsdl", arg0);
     }
 
     /**
@@ -69,11 +67,11 @@
      *
      */
     public static String WSDL_IMPORT_SHOULD_BE_WSDL(Object arg0) {
-        return localizer.localize(localizableWSDL_IMPORT_SHOULD_BE_WSDL(arg0));
+        return LOCALIZER.localize(localizableWSDL_IMPORT_SHOULD_BE_WSDL(arg0));
     }
 
     public static Localizable localizableMEX_METADATA_SYSTEMID_NULL() {
-        return messageFactory.getMessage("Mex.metadata.systemid.null");
+        return MESSAGE_FACTORY.getMessage("Mex.metadata.systemid.null");
     }
 
     /**
@@ -81,7 +79,18 @@
      *
      */
     public static String MEX_METADATA_SYSTEMID_NULL() {
-        return localizer.localize(localizableMEX_METADATA_SYSTEMID_NULL());
+        return LOCALIZER.localize(localizableMEX_METADATA_SYSTEMID_NULL());
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }