--- old/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java	2016-09-22 17:06:59.050006270 +0300
+++ new/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java	2016-09-22 17:06:58.946003056 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -171,11 +171,10 @@
     @SuppressWarnings("CallToThreadDumpStack")
     protected void doPostProcessWebService(WebService webService, TypeElement d) {
         if (cm != null) {
-            File sourceDir = builder.getSourceDir();
-            assert(sourceDir != null);
             WsgenOptions options = builder.getOptions();
+            assert options.filer != null;
             try {
-                CodeWriter cw = new FilerCodeWriter(sourceDir, options);
+                CodeWriter cw = new FilerCodeWriter(options);
                 if(options.verbose)
                     cw = new ProgressCodeWriter(cw, System.out);
                 cm.build(cw);
@@ -248,9 +247,7 @@
         }
         builder.log("requestWrapper: "+requestClassName);
 ///// fix for wsgen CR 6442344
-        File file = new File(DirectoryUtil.getOutputDirectoryFor(requestClassName, builder.getSourceDir()),
-                Names.stripQualifier(requestClassName) + GeneratorConstants.JAVA_SRC_SUFFIX.getValue());
-        builder.getOptions().addGeneratedFile(file);
+        addGeneratedFile(requestClassName);
 //////////
         boolean canOverwriteRequest = builder.canOverWriteClass(requestClassName);
         if (!canOverwriteRequest) {
@@ -282,9 +279,7 @@
                 builder.processError(WebserviceapMessages.WEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(
                         typeElement.getQualifiedName(), method.toString()));
             }
-            file = new File(DirectoryUtil.getOutputDirectoryFor(responseClassName, builder.getSourceDir()),
-                    Names.stripQualifier(responseClassName) + GeneratorConstants.JAVA_SRC_SUFFIX.getValue());
-            builder.getOptions().addGeneratedFile(file);
+            addGeneratedFile(responseClassName);
         }
         //ArrayList<MemberInfo> reqMembers = new ArrayList<MemberInfo>();
         //ArrayList<MemberInfo> resMembers = new ArrayList<MemberInfo>();
@@ -334,6 +329,12 @@
         return true;
     }
 
+    private void addGeneratedFile(String requestClassName) {
+        File file = new File(DirectoryUtil.getOutputDirectoryFor(requestClassName, builder.getSourceDir()),
+                Names.stripQualifier(requestClassName) + GeneratorConstants.JAVA_SRC_SUFFIX.getValue());
+        builder.getOptions().addGeneratedFile(file);
+    }
+
 //    private List<Annotation> collectJAXBAnnotations(Declaration decl) {
 //        List<Annotation> jaxbAnnotation = new ArrayList<Annotation>();
 //        for(Class jaxbClass : jaxbAnns) {
@@ -471,8 +472,11 @@
             seiContext.addExceptionBeanEntry(thrownDecl.getQualifiedName(), faultInfo, builder);
             return false;
         }
-        if (seiContext.getExceptionBeanName(thrownDecl.getQualifiedName()) != null)
+        if (seiContext.getExceptionBeanName(thrownDecl.getQualifiedName()) != null) {
             return false;
+        }
+
+        addGeneratedFile(className);
 
         //write class comment - JAXWS warning
         JDocComment comment = cls.javadoc();