src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.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
*** 94,111 ****
                  Native.putLong(data, action_count,
                                 XDnDConstants.XA_XdndActionLink.getAtom());
                  action_count++;
              }
  
!             XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
              XDnDConstants.XA_XdndActionList.setAtomData(window,
                                                          XAtom.XA_ATOM,
                                                          data, action_count);
!             XToolkit.RESTORE_XERROR_HANDLER();
  
!             if (XToolkit.saved_error != null &&
!                 XToolkit.saved_error.get_error_code() != XConstants.Success) {
                  cleanup();
                  throw new XException("Cannot write XdndActionList property");
              }
          } finally {
              unsafe.freeMemory(data);
--- 94,111 ----
                  Native.putLong(data, action_count,
                                 XDnDConstants.XA_XdndActionLink.getAtom());
                  action_count++;
              }
  
!             XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
              XDnDConstants.XA_XdndActionList.setAtomData(window,
                                                          XAtom.XA_ATOM,
                                                          data, action_count);
!             XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
  
!             if ((XErrorHandlerUtil.saved_error) != null &&
!                 (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
                  cleanup();
                  throw new XException("Cannot write XdndActionList property");
              }
          } finally {
              unsafe.freeMemory(data);
*** 115,132 ****
          data = Native.allocateLongArray(formats.length);
  
          try {
              Native.put(data, formats);
  
!             XToolkit.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
              XDnDConstants.XA_XdndTypeList.setAtomData(window,
                                                        XAtom.XA_ATOM,
                                                        data, formats.length);
!             XToolkit.RESTORE_XERROR_HANDLER();
  
!             if (XToolkit.saved_error != null &&
!                 XToolkit.saved_error.get_error_code() != XConstants.Success) {
                  cleanup();
                  throw new XException("Cannot write XdndActionList property");
              }
          } finally {
              unsafe.freeMemory(data);
--- 115,132 ----
          data = Native.allocateLongArray(formats.length);
  
          try {
              Native.put(data, formats);
  
!             XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.VerifyChangePropertyHandler.getInstance());
              XDnDConstants.XA_XdndTypeList.setAtomData(window,
                                                        XAtom.XA_ATOM,
                                                        data, formats.length);
!             XErrorHandlerUtil.RESTORE_XERROR_HANDLER();
  
!             if ((XErrorHandlerUtil.saved_error != null) &&
!                 (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
                  cleanup();
                  throw new XException("Cannot write XdndActionList property");
              }
          } finally {
              unsafe.freeMemory(data);