Fix for compilation in TARGET_JVM

svn path=/trunk/mcs/; revision=82034

diff --git a/mcs/class/System/System.ComponentModel/TypeDescriptor.cs b/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
index ef5cb2c3667503ec1f3082d12d42eaea86bba2db..1e0942b9709d1b8272fe9c4fb4342262743b4abb 100644 (file)
--- a/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
+++ b/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
@@ -519,11 +519,12 @@ public sealed class TypeDescriptor
                        return CreateEditor (t, componentType);
                        
                if (t == null) {
+#if !TARGET_JVM
                        // Make sure the editorBaseType's static constructor has been called,
                        // since that's where we're putting the initialization of its editor table.
                        
                        System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor (editorBaseType.TypeHandle);
-                               
+#endif                         
                        if (editors != null) {
                                return FindEditorInTable (componentType, editorBaseType, editors [editorBaseType] as Hashtable);
                        }