src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2008, 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
*** 97,107 ****
              if (errorHandler instanceof XErrorHandler.IgnoreBadWindowHandler) {
                  errorHandler = null;
              }
  
              if (errorHandler != null) {
!                 XToolkit.WITH_XERROR_HANDLER(errorHandler);
              }
              Native.putLong(data, 0);
              int status = XlibWrapper.XGetWindowProperty(XToolkit.getDisplay(), window, property.getAtom(),
                                                          offset, length, (auto_delete?1:0), type,
                                                          actual_type, actual_format, nitems_ptr,
--- 97,107 ----
              if (errorHandler instanceof XErrorHandler.IgnoreBadWindowHandler) {
                  errorHandler = null;
              }
  
              if (errorHandler != null) {
!                 XErrorHandlerUtil.WITH_XERROR_HANDLER(errorHandler);
              }
              Native.putLong(data, 0);
              int status = XlibWrapper.XGetWindowProperty(XToolkit.getDisplay(), window, property.getAtom(),
                                                          offset, length, (auto_delete?1:0), type,
                                                          actual_type, actual_format, nitems_ptr,
*** 110,120 ****
                  // Property has some data, we cache them
                  cacheProperty();
              }
  
              if (errorHandler != null) {
!                 XToolkit.RESTORE_XERROR_HANDLER();
              }
              return status;
          } finally {
              XToolkit.awtUnlock();
          }
--- 110,120 ----
                  // Property has some data, we cache them
                  cacheProperty();
              }
  
              if (errorHandler != null) {
!                 XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
              }
              return status;
          } finally {
              XToolkit.awtUnlock();
          }