src/java.base/share/native/libjava/System.c

rev 53037 : 8242154: Backport parts of JDK-4947890 to OpenJDK 11u

*** 1,7 ****
  /*
!  * Copyright (c) 1994, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 54,63 ****
--- 54,65 ----
  Java_java_lang_System_identityHashCode(JNIEnv *env, jobject this, jobject x)
  {
      return JVM_IHashCode(env, x);
  }
  
+ /* VENDOR, VENDOR_URL, VENDOR_URL_BUG are set in VersionProps.java.template. */
+ 
  #define PUTPROP(props, key, val)                                     \
      if (1) {                                                         \
          jstring jkey, jval;                                          \
          jobject r;                                                   \
          jkey = (*env)->NewStringUTF(env, key);                       \
*** 106,126 ****
          jret = (*env)->CallObjectMethod(env, props, getPropID, jkey); \
          if ((*env)->ExceptionOccurred(env)) return NULL;              \
          (*env)->DeleteLocalRef(env, jkey);                            \
      } else ((void) 0)
  
- /* Third party may overwrite these values. */
- #ifndef VENDOR
- #define VENDOR "Oracle Corporation"
- #endif
- #ifndef VENDOR_URL
- #define VENDOR_URL "http://java.oracle.com/"
- #endif
- #ifndef VENDOR_URL_BUG
- #define VENDOR_URL_BUG "http://bugreport.java.com/bugreport/"
- #endif
- 
  #ifdef JAVA_SPECIFICATION_VENDOR /* Third party may NOT overwrite this. */
    #error "ERROR: No override of JAVA_SPECIFICATION_VENDOR is allowed"
  #else
    #define JAVA_SPECIFICATION_VENDOR "Oracle Corporation"
  #endif
--- 108,117 ----
*** 209,223 ****
      PUTPROP(props, "java.specification.name",
              "Java Platform API Specification");
      PUTPROP(props, "java.specification.vendor",
              JAVA_SPECIFICATION_VENDOR);
  
-     PUTPROP(props, "java.version", VERSION_SHORT);
-     PUTPROP(props, "java.vendor", VENDOR);
-     PUTPROP(props, "java.vendor.url", VENDOR_URL);
-     PUTPROP(props, "java.vendor.url.bug", VENDOR_URL_BUG);
- 
      jio_snprintf(buf, sizeof(buf), "%d.%d", JVM_CLASSFILE_MAJOR_VERSION,
                                              JVM_CLASSFILE_MINOR_VERSION);
      PUTPROP(props, "java.class.version", buf);
  
      if (sprops->awt_toolkit) {
--- 200,209 ----