src/share/jaxws_classes/com/sun/tools/internal/xjc/Driver.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2011, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 36,45 ****
--- 36,46 ----
  import com.sun.codemodel.internal.CodeWriter;
  import com.sun.codemodel.internal.JCodeModel;
  import com.sun.codemodel.internal.writer.ZipCodeWriter;
  import com.sun.istack.internal.NotNull;
  import com.sun.istack.internal.Nullable;
+ import com.sun.istack.internal.tools.DefaultAuthenticator;
  import com.sun.tools.internal.xjc.generator.bean.BeanGenerator;
  import com.sun.tools.internal.xjc.model.Model;
  import com.sun.tools.internal.xjc.outline.Outline;
  import com.sun.tools.internal.xjc.reader.gbind.Expression;
  import com.sun.tools.internal.xjc.reader.gbind.Graph;
*** 220,232 ****
  
          final OptionsEx opt = new OptionsEx();
          opt.setSchemaLanguage(Language.XMLSCHEMA);  // disable auto-guessing
          try {
              opt.parseArguments(args);
!         } catch (WeAreDone _) {
              return -1;
          } catch(BadCommandLineException e) {
              e.initOptions(opt);
              throw e;
          }
  
          // display a warning if the user specified the default package
--- 221,239 ----
  
          final OptionsEx opt = new OptionsEx();
          opt.setSchemaLanguage(Language.XMLSCHEMA);  // disable auto-guessing
          try {
              opt.parseArguments(args);
!         } catch (WeAreDone e) {
!             if (opt.proxyAuth != null) {
!                 DefaultAuthenticator.reset();
!             }
              return -1;
          } catch(BadCommandLineException e) {
+             if (opt.proxyAuth != null) {
+                 DefaultAuthenticator.reset();
+             }
              e.initOptions(opt);
              throw e;
          }
  
          // display a warning if the user specified the default package
*** 399,408 ****
--- 406,419 ----
                  // otherwise just print a suggested workaround and
                  // quit without filling the user's screen
                  listener.message(Messages.format(Messages.STACK_OVERFLOW));
                  return -1;
              }
+         } finally {
+             if (opt.proxyAuth != null) {
+                 DefaultAuthenticator.reset();
+             }
          }
      }
  
      public static String getBuildID() {
          return Messages.format(Messages.BUILD_ID);