--- a/src/share/vm/classfile/verifier.cpp	Mon Nov 15 16:25:14 2010 -0800
+++ b/src/share/vm/classfile/verifier.cpp	Wed Nov 17 09:21:51 2010 -0500
@@ -247,6 +247,10 @@
 ClassVerifier::~ClassVerifier() {
 }
 
+VerificationType ClassVerifier::object_type() const {
+  return VerificationType::reference_type(vmSymbols::java_lang_Object());
+}
+
 void ClassVerifier::verify_class(TRAPS) {
   if (_verify_verbose) {
     tty->print_cr("Verifying class %s with new format",
@@ -726,8 +730,7 @@
           }
           no_control_flow = false; break;
         case Bytecodes::_aastore :
-          type = current_frame.pop_stack(
-            VerificationType::reference_check(), CHECK_VERIFY(this));
+          type = current_frame.pop_stack(object_type(), CHECK_VERIFY(this));
           type2 = current_frame.pop_stack(
             VerificationType::integer_type(), CHECK_VERIFY(this));
           atype = current_frame.pop_stack(
@@ -1232,8 +1235,7 @@
         {
           index = bcs.get_index_u2();
           verify_cp_class_type(index, cp, CHECK_VERIFY(this));
-          current_frame.pop_stack(
-            VerificationType::reference_check(), CHECK_VERIFY(this));
+          current_frame.pop_stack(object_type(), CHECK_VERIFY(this));
           VerificationType klass_type = cp_index_to_type(
             index, cp, CHECK_VERIFY(this));
           current_frame.push_stack(klass_type, CHECK_VERIFY(this));
@@ -1242,8 +1244,7 @@
         case Bytecodes::_instanceof : {
           index = bcs.get_index_u2();
           verify_cp_class_type(index, cp, CHECK_VERIFY(this));
-          current_frame.pop_stack(
-            VerificationType::reference_check(), CHECK_VERIFY(this));
+          current_frame.pop_stack(object_type(), CHECK_VERIFY(this));
           current_frame.push_stack(
             VerificationType::integer_type(), CHECK_VERIFY(this));
           no_control_flow = false; break;
@@ -1610,9 +1611,7 @@
     verify_cp_type(index, cp, types, CHECK_VERIFY(this));
   }
   if (tag.is_string() && cp->is_pseudo_string_at(index)) {
-    current_frame->push_stack(
-      VerificationType::reference_type(
-        vmSymbols::java_lang_Object()), CHECK_VERIFY(this));
+    current_frame->push_stack(object_type(), CHECK_VERIFY(this));
   } else if (tag.is_string() || tag.is_unresolved_string()) {
     current_frame->push_stack(
       VerificationType::reference_type(

--- a/src/share/vm/classfile/verifier.hpp	Mon Nov 15 16:25:14 2010 -0800
+++ b/src/share/vm/classfile/verifier.hpp	Wed Nov 17 09:21:51 2010 -0500
@@ -157,6 +157,8 @@
 
   bool name_in_supers(symbolOop ref_name, instanceKlassHandle current);
 
+  VerificationType object_type() const;
+
   instanceKlassHandle _klass;  // the class being verified
   methodHandle        _method; // current method being verified
   VerificationType    _this_type; // the verification type of the current class

--- a/src/share/vm/runtime/arguments.cpp	Mon Nov 15 16:25:14 2010 -0800
+++ b/src/share/vm/runtime/arguments.cpp	Wed Nov 17 09:21:51 2010 -0500
@@ -116,7 +116,6 @@
 // Initialize system properties key and value.
 void Arguments::init_system_properties() {
 
-  PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.version", "1.0", false));
   PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.name",
                                                                  "Java Virtual Machine Specification",  false));
   PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(),  false));
@@ -151,9 +150,23 @@
 
   // Update/Initialize System properties after JDK version number is known
 void Arguments::init_version_specific_system_properties() {
-  PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.vendor",
-        JDK_Version::is_gte_jdk17x_version() ? "Oracle Corporation" : "Sun Microsystems Inc.", false));
-  PropertyList_add(&_system_properties, new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(),  false));
+  enum { bufsz = 16 };
+  char buffer[bufsz];
+  const char* spec_vendor = "Sun Microsystems Inc.";
+  uint32_t spec_version = 0;
+
+  if (JDK_Version::is_gte_jdk17x_version()) {
+    spec_vendor = "Oracle Corporation";
+    spec_version = JDK_Version::current().major_version();
+  }
+  jio_snprintf(buffer, bufsz, "1." UINT32_FORMAT, spec_version);
+
+  PropertyList_add(&_system_properties,
+      new SystemProperty("java.vm.specification.vendor",  spec_vendor, false));
+  PropertyList_add(&_system_properties,
+      new SystemProperty("java.vm.specification.version", buffer, false));
+  PropertyList_add(&_system_properties,
+      new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(),  false));
 }
 
 /**

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/runtime/6981737/Test6981737.java	Wed Nov 17 09:21:51 2010 -0500
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2010, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test Test6981737.java
+ * @bug 6981737
+ * @summary check for correct vm properties
+ * @run main Test6981737
+ * @author kamg
+*/
+
+public class Test6981737 {
+
+    /**
+     * Check the 'vendor' properties java.vm.specification.version
+     * property.  Before jdk7, they should be "Sun Micro..." and "1.0".
+     * In jdk7 onwards they should be "Oracle..." and "1.<major_version>"
+     */
+    public static void main(String[] args) throws Exception {
+
+        String version = verifyProperty("java.version", "[0-9]+\\.[0-9]+\\..*");
+        String major_version_spec = version.split("\\.")[1];
+        int major_version = new Integer(major_version_spec).intValue();
+
+        String vendor_re = "Oracle Corporation";
+        String vm_spec_version_re = "1\\." + major_version_spec;
+        if (major_version < 7) {
+            vendor_re = "Sun Microsystems Inc\\.";
+            vm_spec_version_re = "1\\.0";
+        }
+        verifyProperty("java.vendor", vendor_re);
+        verifyProperty("java.vm.vendor", vendor_re);
+        verifyProperty("java.vm.specification.vendor", vendor_re);
+        verifyProperty("java.specification.vendor", vendor_re);
+        verifyProperty("java.vm.specification.version", vm_spec_version_re);
+        System.out.println("PASS");
+    }
+
+    public static String verifyProperty(String name, String expected_re) {
+        String value = System.getProperty(name, "");
+        System.out.print("Checking " + name + ": \"" + value +
+          "\".matches(\"" + expected_re + "\")... ");
+        if (!value.matches(expected_re)) {
+            System.out.println("no.");
+            throw new RuntimeException("FAIL: Wrong value for " + name +
+                " property, \"" + value + "\", expected to be of form: \"" +
+                expected_re + "\"");
+        }
+        System.out.println("yes.");
+        return value;
+    }
+}