equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. |
7 * published by the Free Software Foundation. |
23 */ |
23 */ |
24 |
24 |
25 #include "precompiled.hpp" |
25 #include "precompiled.hpp" |
26 #include "classfile/classLoader.hpp" |
26 #include "classfile/classLoader.hpp" |
27 #include "classfile/javaClasses.hpp" |
27 #include "classfile/javaClasses.hpp" |
|
28 #include "classfile/moduleEntry.hpp" |
28 #include "classfile/systemDictionary.hpp" |
29 #include "classfile/systemDictionary.hpp" |
29 #include "classfile/vmSymbols.hpp" |
30 #include "classfile/vmSymbols.hpp" |
30 #include "code/codeCache.hpp" |
31 #include "code/codeCache.hpp" |
31 #include "code/icBuffer.hpp" |
32 #include "code/icBuffer.hpp" |
32 #include "code/vtableStubs.hpp" |
33 #include "code/vtableStubs.hpp" |
1227 return true; |
1228 return true; |
1228 } |
1229 } |
1229 FREE_C_HEAP_ARRAY(char, jimage); |
1230 FREE_C_HEAP_ARRAY(char, jimage); |
1230 |
1231 |
1231 // check if developer build with exploded modules |
1232 // check if developer build with exploded modules |
1232 char* base_classes = format_boot_path("%/modules/java.base", home, home_len, fileSep, pathSep); |
1233 char* base_classes = format_boot_path("%/modules/" JAVA_BASE_NAME, home, home_len, fileSep, pathSep); |
1233 if (base_classes == NULL) return false; |
1234 if (base_classes == NULL) return false; |
1234 if (os::stat(base_classes, &st) == 0) { |
1235 if (os::stat(base_classes, &st) == 0) { |
1235 Arguments::set_sysclasspath(base_classes, false); |
1236 Arguments::set_sysclasspath(base_classes, false); |
1236 FREE_C_HEAP_ARRAY(char, base_classes); |
1237 FREE_C_HEAP_ARRAY(char, base_classes); |
1237 return true; |
1238 return true; |