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. |
362 const int base_version = 8; // JDK8 |
362 const int base_version = 8; // JDK8 |
363 int cur_ver = JDK_Version::current().major_version(); |
363 int cur_ver = JDK_Version::current().major_version(); |
364 if (verstr != NULL) { |
364 if (verstr != NULL) { |
365 version = atoi(verstr); |
365 version = atoi(verstr); |
366 if (version < base_version || version > cur_ver) { |
366 if (version < base_version || version > cur_ver) { |
367 is_multi_ver = false; |
367 // If the specified version is lower than the base version, the base |
|
368 // entry will be used; if the version is higher than the current |
|
369 // jdk version, the highest versioned entry will be used. |
|
370 if (version < base_version) { |
|
371 is_multi_ver = false; |
|
372 } |
368 // print out warning, do not use assertion here since it will continue to look |
373 // print out warning, do not use assertion here since it will continue to look |
369 // for proper version. |
374 // for proper version. |
370 warning("JDK%d is not supported in multiple version jars", version); |
375 warning("JDK%d is not supported in multiple version jars", version); |
371 } |
376 } |
372 } |
377 } |