src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2009, 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) 2003, 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
*** 994,1004 ****
              pw.println("\t\t\tif (__executed) {");
              pw.println("\t\t\t    throw new IllegalStateException(\"Already executed\");");
              pw.println("\t\t\t}");
              pw.println("\t\t\t__executed = true;");
              pw.println("\t\t\tif (errorHandler != null) {");
!             pw.println("\t\t\t    XToolkit.WITH_XERROR_HANDLER(errorHandler);");
              pw.println("\t\t\t}");
              iter = ft.getArguments().iterator();
              while (iter.hasNext()) {
                  AtomicType at = (AtomicType)iter.next();
                  if (!at.isIn() && at.isAutoFree()) {
--- 994,1004 ----
              pw.println("\t\t\tif (__executed) {");
              pw.println("\t\t\t    throw new IllegalStateException(\"Already executed\");");
              pw.println("\t\t\t}");
              pw.println("\t\t\t__executed = true;");
              pw.println("\t\t\tif (errorHandler != null) {");
!             pw.println("\t\t\t    XErrorHandlerUtil.WITH_XERROR_HANDLER(errorHandler);");
              pw.println("\t\t\t}");
              iter = ft.getArguments().iterator();
              while (iter.hasNext()) {
                  AtomicType at = (AtomicType)iter.next();
                  if (!at.isIn() && at.isAutoFree()) {
*** 1023,1033 ****
                      pw.print("\t\t\t\t" + at.getName() + "_ptr");
                  }
              }
              pw.println("\t\t\t);");
              pw.println("\t\t\tif (errorHandler != null) {");
!             pw.println("\t\t\t    XToolkit.RESTORE_XERROR_HANDLER();");
              pw.println("\t\t\t}");
              if (!ft.isVoid()) {
                  pw.println("\t\t\treturn status;");
              }
              pw.println("\t\t} finally {");
--- 1023,1033 ----
                      pw.print("\t\t\t\t" + at.getName() + "_ptr");
                  }
              }
              pw.println("\t\t\t);");
              pw.println("\t\t\tif (errorHandler != null) {");
!             pw.println("\t\t\t    XErrorHandlerUtil.RESTORE_XERROR_HANDLER();");
              pw.println("\t\t\t}");
              if (!ft.isVoid()) {
                  pw.println("\t\t\treturn status;");
              }
              pw.println("\t\t} finally {");