src/java.desktop/share/classes/java/awt/Component.java

*** 7150,7160 ****
                  isAddNotifyComplete = false;
                  // Nullifying compoundShape means that the component has normal shape
                  // (or has no shape at all).
                  this.compoundShape = null;
              }
! 
              if (hierarchyListener != null ||
                  (eventMask & AWTEvent.HIERARCHY_EVENT_MASK) != 0 ||
                  Toolkit.enabledOnToolkit(AWTEvent.HIERARCHY_EVENT_MASK)) {
                  HierarchyEvent e =
                      new HierarchyEvent(this, HierarchyEvent.HIERARCHY_CHANGED,
--- 7150,7163 ----
                  isAddNotifyComplete = false;
                  // Nullifying compoundShape means that the component has normal shape
                  // (or has no shape at all).
                  this.compoundShape = null;
              }
!             AccessibleContext ac = getAccessibleContext();
!             if (ac != null) {
!                 AWTAccessor.getAccessibleContextAccessor().dispose(ac);
!             }
              if (hierarchyListener != null ||
                  (eventMask & AWTEvent.HIERARCHY_EVENT_MASK) != 0 ||
                  Toolkit.enabledOnToolkit(AWTEvent.HIERARCHY_EVENT_MASK)) {
                  HierarchyEvent e =
                      new HierarchyEvent(this, HierarchyEvent.HIERARCHY_CHANGED,