src/hotspot/share/oops/instanceKlass.cpp

*** 1139,1153 ****
--- 1139,1155 ----
            }
            this->set_value_field_klass(fs.index(), klass);
          }
          InstanceKlass::cast(klass)->initialize(CHECK);
          if (fs.access_flags().is_static()) {
+           if (java_mirror()->obj_field(fs.offset()) == NULL) {
              java_mirror()->obj_field_put(fs.offset(), ValueKlass::cast(klass)->default_value());
            }
          }
        }
      }
+   }
  
  
    // Look for aot compiled methods for this klass, including class initializer.
    AOTLoader::load_for_klass(this, THREAD);