equal
deleted
inserted
replaced
1455 // Load Attempt #2: [jimage | exploded build] |
1455 // Load Attempt #2: [jimage | exploded build] |
1456 if (!search_append_only && (NULL == stream)) { |
1456 if (!search_append_only && (NULL == stream)) { |
1457 if (has_jrt_entry()) { |
1457 if (has_jrt_entry()) { |
1458 e = _jrt_entry; |
1458 e = _jrt_entry; |
1459 stream = _jrt_entry->open_stream(file_name, CHECK_NULL); |
1459 stream = _jrt_entry->open_stream(file_name, CHECK_NULL); |
1460 if (!context.check(stream, classpath_index)) { |
|
1461 return NULL; |
|
1462 } |
|
1463 } else { |
1460 } else { |
1464 // Exploded build - attempt to locate class in its defining module's location. |
1461 // Exploded build - attempt to locate class in its defining module's location. |
1465 assert(_exploded_entries != NULL, "No exploded build entries present"); |
1462 assert(_exploded_entries != NULL, "No exploded build entries present"); |
1466 stream = search_module_entries(_exploded_entries, class_name, file_name, CHECK_NULL); |
1463 stream = search_module_entries(_exploded_entries, class_name, file_name, CHECK_NULL); |
1467 } |
1464 } |
1476 classpath_index = 1; |
1473 classpath_index = 1; |
1477 |
1474 |
1478 e = _first_append_entry; |
1475 e = _first_append_entry; |
1479 while (e != NULL) { |
1476 while (e != NULL) { |
1480 stream = e->open_stream(file_name, CHECK_NULL); |
1477 stream = e->open_stream(file_name, CHECK_NULL); |
1481 if (!context.check(stream, classpath_index)) { |
|
1482 return NULL; |
|
1483 } |
|
1484 if (NULL != stream) { |
1478 if (NULL != stream) { |
1485 break; |
1479 break; |
1486 } |
1480 } |
1487 e = e->next(); |
1481 e = e->next(); |
1488 ++classpath_index; |
1482 ++classpath_index; |