--- a/javauis/lcdui_akn/javalcdui/javasrc.nokialcdui/com/nokia/mid/ui/TextEditor.java	Thu Jul 15 18:31:06 2010 +0300
+++ b/javauis/lcdui_akn/javalcdui/javasrc.nokialcdui/com/nokia/mid/ui/TextEditor.java	Thu Aug 19 09:48:13 2010 +0300
@@ -931,6 +931,8 @@
      * rendered using given color value. The default highlight background
      * color is fully opaque black.
      *
+     * This method is not supported on S40 platform.
+     *
      * @param color
      *            the color
      */
@@ -951,6 +953,8 @@
      * using given color value. The default highlight foreground color is fully
      * opaque white.
      *
+     * This method is not supported on S40 platform.
+     *
      * @param color
      *            the color
      */
@@ -1436,19 +1440,23 @@
      */
     final void registeredFinalize()
     {
-        synchronized (iToolkit)
+        if (mFinalizer!=null)
         {
-            if (iHandle > 0)
+            synchronized (iToolkit)
             {
-                _dispose(getToolkitHandle(), iHandle);
-                iHandle = 0;
+                if (iHandle > 0)
+                {
+                    iToolkitInvoker.toolkitDisposeObject(iToolkit,iHandle);
+                    iHandle = 0;
 
-                if (iParent != null)
-                {
-                    // Remove from editor container.
-                    iEditorContainer.removeEditor(this, iParent);
+                    if (iParent != null)
+                    {
+                        // Remove from editor container.
+                        iEditorContainer.removeEditor(this, iParent);
+                    }
                 }
             }
+            mFinalizer = null;
         }
     }