--- old/src/share/native/sun/misc/Version.c	2014-01-10 15:30:11.059254664 -0800
+++ new/src/share/native/sun/misc/Version.c	2014-01-10 15:30:10.883254671 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, 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
@@ -34,44 +34,13 @@
 char jdk_special_version = '\0';
 static void setStaticIntField(JNIEnv* env, jclass cls, const char* name, jint value)
 {
-    char errmsg[100];
     jfieldID fid;
     fid = (*env)->GetStaticFieldID(env, cls, name, "I");
     if (fid != 0) {
         (*env)->SetStaticIntField(env, cls, fid, value);
-    } else {
-        sprintf(errmsg, "Static int field %s not found", name);
-        JNU_ThrowInternalError(env, errmsg);
     }
 }
 
-static void setStaticBooleanField(JNIEnv* env, jclass cls, const char* name, jboolean value)
-{
-    char errmsg[100];
-    jfieldID fid;
-    fid = (*env)->GetStaticFieldID(env, cls, name, "Z");
-    if (fid != 0) {
-        (*env)->SetStaticBooleanField(env, cls, fid, value);
-    } else {
-        sprintf(errmsg, "Static boolean field %s not found", name);
-        JNU_ThrowInternalError(env, errmsg);
-    }
-}
-
-static void setStaticStringField(JNIEnv* env, jclass cls, const char* name, jstring value)
-{
-    char errmsg[100];
-    jfieldID fid;
-    fid = (*env)->GetStaticFieldID(env, cls, name, "Ljava/lang/String");
-    if (fid != 0) {
-        (*env)->SetStaticObjectField(env, cls, fid, value);
-    } else {
-        sprintf(errmsg, "Static String field %s not found", name);
-        JNU_ThrowInternalError(env, errmsg);
-    }
-}
-
-
 typedef void (JNICALL *GetJvmVersionInfo_fp)(JNIEnv*, jvm_version_info*, size_t);
 
 JNIEXPORT jboolean JNICALL
@@ -82,6 +51,7 @@
 
     if (!JDK_InitJvmHandle()) {
         JNU_ThrowInternalError(env, "Handle for JVM not found for symbol lookup");
+        return JNI_FALSE;
     }
     func_p = (GetJvmVersionInfo_fp) JDK_FindJvmEntry("JVM_GetVersionInfo");
     if (func_p == NULL) {
@@ -90,10 +60,15 @@
 
     (*func_p)(env, &info, sizeof(info));
     setStaticIntField(env, cls, "jvm_major_version", JVM_VERSION_MAJOR(info.jvm_version));
+    CHECK_EXCEPTION_RETURN(env, JNI_FALSE);
     setStaticIntField(env, cls, "jvm_minor_version", JVM_VERSION_MINOR(info.jvm_version));
+    CHECK_EXCEPTION_RETURN(env, JNI_FALSE);
     setStaticIntField(env, cls, "jvm_micro_version", JVM_VERSION_MICRO(info.jvm_version));
+    CHECK_EXCEPTION_RETURN(env, JNI_FALSE);
     setStaticIntField(env, cls, "jvm_build_number", JVM_VERSION_BUILD(info.jvm_version));
+    CHECK_EXCEPTION_RETURN(env, JNI_FALSE);
     setStaticIntField(env, cls, "jvm_update_version", info.update_version);
+    CHECK_EXCEPTION_RETURN(env, JNI_FALSE);
     jvm_special_version = info.special_update_version;
 
     return JNI_TRUE;
@@ -116,10 +91,15 @@
 
     JDK_GetVersionInfo0(&info, sizeof(info));
     setStaticIntField(env, cls, "jdk_major_version", JDK_VERSION_MAJOR(info.jdk_version));
+    CHECK_EXCEPTION(env);
     setStaticIntField(env, cls, "jdk_minor_version", JDK_VERSION_MINOR(info.jdk_version));
+    CHECK_EXCEPTION(env);
     setStaticIntField(env, cls, "jdk_micro_version", JDK_VERSION_MICRO(info.jdk_version));
+    CHECK_EXCEPTION(env);
     setStaticIntField(env, cls, "jdk_build_number", JDK_VERSION_BUILD(info.jdk_version));
+    CHECK_EXCEPTION(env);
     setStaticIntField(env, cls, "jdk_update_version", info.update_version);
+    CHECK_EXCEPTION(env);
     jdk_special_version = info.special_update_version;
 }