archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8250678: ModuleDescriptor.Version parsing treats empty segments inconsistently

Browse source 
Reviewed-by: mchung, alanb
This commit is contained in:
Masanori Yano 2021-11-09 14:28:07 +00:00 • committed by Alan Bateman
parent 4bd5bfd8e2
commit e198594753
2 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
View file

@ -1033,13 +1033,6 @@ public class ModuleDescriptor
while (i < n) {
c = v.charAt(i);
if (c >= '0' && c <= '9')
i = takeNumber(v, i, pre);
else
i = takeString(v, i, pre);
if (i >= n)
break;
c = v.charAt(i);
if (c == '.' || c == '-') {
i++;
continue;
@ -1048,6 +1041,10 @@ public class ModuleDescriptor
i++;
break;
}
if (c >= '0' && c <= '9')
i = takeNumber(v, i, pre);
else
i = takeString(v, i, pre);
}
if (c == '+' && i >= n)
@ -1055,17 +1052,14 @@ public class ModuleDescriptor
while (i < n) {
c = v.charAt(i);
if (c >= '0' && c <= '9')
i = takeNumber(v, i, build);
else
i = takeString(v, i, build);
if (i >= n)
break;
c = v.charAt(i);
if (c == '.' || c == '-' || c == '+') {
i++;
continue;
}
if (c >= '0' && c <= '9')
i = takeNumber(v, i, build);
else
i = takeString(v, i, build);
}
this.version = v;