src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.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
*** 293,311 ****
      Rectangle getClientBounds() {
          XToolkit.awtLock();
          try {
              XWindowAttributes wattr = new XWindowAttributes();
              try {
!                 XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
                  int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
                                                                xembed.handle, wattr.pData);
  
!                 XToolkit.RESTORE_XERROR_HANDLER();
  
!                 if (status == 0 ||
!                     (XToolkit.saved_error != null &&
!                      XToolkit.saved_error.get_error_code() != XConstants.Success)) {
                      return null;
                  }
  
                  return new Rectangle(wattr.get_x(), wattr.get_y(), wattr.get_width(), wattr.get_height());
              } finally {
--- 293,311 ----
      Rectangle getClientBounds() {
          XToolkit.awtLock();
          try {
              XWindowAttributes wattr = new XWindowAttributes();
              try {
!                 XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance());
                  int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
                                                                xembed.handle, wattr.pData);
  
!                 XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
  
!                 if ((status == 0) ||
!                     ((XErrorHandlerUtil.saved_error != null) &&
!                     (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) {
                      return null;
                  }
  
                  return new Rectangle(wattr.get_x(), wattr.get_y(), wattr.get_width(), wattr.get_height());
              } finally {