Mercurial > hg > truffle

comparison src/share/vm/prims/jvmtiExport.cpp @ 1988:684faacebf20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7003782: Update JVMTI version to 1.2 for jdk7 Summary: Update minor version to 1.2 for jdk7 Reviewed-by: phh, dcubed
author kamg
date Mon, 06 Dec 2010 20:21:15 -0500
parents 828eafbd85cc
children 7246a374a9f2
comparison
equal deleted inserted replaced
1987:42f65821fa4e 1988:684faacebf20
352 int major, minor, micro; 352 int major, minor, micro;
353 353
354 // micro version doesn't matter here (yet?) 354 // micro version doesn't matter here (yet?)
355 decode_version_values(version, &major, &minor, &micro); 355 decode_version_values(version, &major, &minor, &micro);
356 switch (major) { 356 switch (major) {
357 case 1: 357 case 1:
358 switch (minor) { 358 switch (minor) {
359 case 0: // version 1.0.<micro> is recognized 359 case 0: // version 1.0.<micro> is recognized
360 case 1: // version 1.1.<micro> is recognized 360 case 1: // version 1.1.<micro> is recognized
361 case 2: // version 1.2.<micro> is recognized
361 break; 362 break;
362 363
363 default: 364 default:
364 return JNI_EVERSION; // unsupported minor version number 365 return JNI_EVERSION; // unsupported minor version number
365 } 366 }
366 break; 367 break;
367 368 default:
368 default:
369 return JNI_EVERSION; // unsupported major version number 369 return JNI_EVERSION; // unsupported major version number
370 } 370 }
371 371
372 if (JvmtiEnv::get_phase() == JVMTI_PHASE_LIVE) { 372 if (JvmtiEnv::get_phase() == JVMTI_PHASE_LIVE) {
373 JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread(); 373 JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread();