--- old/src/java.desktop/unix/classes/sun/awt/X11/XTextFieldPeer.java	2015-06-09 16:19:31.630158900 +0300
+++ new/src/java.desktop/unix/classes/sun/awt/X11/XTextFieldPeer.java	2015-06-09 16:19:31.085049900 +0300
@@ -95,6 +95,7 @@
 
         // After this line we should not change the component's text
         firstChangeSkipped = true;
+        AWTAccessor.getComponentAccessor().setPeer(xtext, this);
     }
 
     @Override
@@ -102,7 +103,6 @@
         XToolkit.specialPeerMap.remove(xtext);
         // visible caret has a timer thread which must be stopped
         xtext.getCaret().setVisible(false);
-        xtext.removeNotify();
         super.dispose();
     }
 
--- old/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java	2015-06-09 16:19:34.436220000 +0300
+++ new/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java	2015-06-09 16:19:33.897112200 +0300
@@ -138,6 +138,7 @@
         setScrollBarVisibility();
         // After this line we should not change the component's text
         firstChangeSkipped = true;
+        compAccessor.setPeer(textPane, this);
     }
 
     @Override
@@ -146,7 +147,6 @@
         // visible caret has a timer thread which must be stopped
         jtext.getCaret().setVisible(false);
         jtext.removeNotify();
-        textPane.removeNotify();
         super.dispose();
     }