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

8217339: ClassCircularityError loading NumberFormatProvider

Browse source 
Reviewed-by: naoto, mchung
This commit is contained in:
Roger Riggs 2019-01-23 09:57:31 -05:00
parent 779991a9c8
commit c99285ea9e
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/java.base/share/classes/java/lang/constant/ClassDesc.java
View file

@ -101,10 +101,8 @@ public interface ClassDesc
return of(className); return of(className);
} }
validateMemberName(requireNonNull(className), false); validateMemberName(requireNonNull(className), false);
return ofDescriptor(String.format("L%s%s%s;", return ofDescriptor("L" + binaryToInternal(packageName) +
binaryToInternal(packageName), (packageName.length() > 0 ? "/" : "") + className + ";");
(packageName.length() > 0 ? "/" : ""),
className));
} }
/** /**
@ -134,12 +132,14 @@ public interface ClassDesc
static ClassDesc ofDescriptor(String descriptor) { static ClassDesc ofDescriptor(String descriptor) {
requireNonNull(descriptor); requireNonNull(descriptor);
if (descriptor.isEmpty()) { if (descriptor.isEmpty()) {
throw new IllegalArgumentException(String.format("not a valid reference type descriptor: %s", descriptor)); throw new IllegalArgumentException(
"not a valid reference type descriptor: " + descriptor);
} }
int depth = ConstantUtils.arrayDepth(descriptor); int depth = ConstantUtils.arrayDepth(descriptor);
if (depth > ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS) { if (depth > ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS) {
throw new IllegalArgumentException(String.format("Cannot create an array type descriptor with more than %d dimensions", throw new IllegalArgumentException(
ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS)); "Cannot create an array type descriptor with more than " +
ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS + " dimensions");
} }
return (descriptor.length() == 1) return (descriptor.length() == 1)
? new PrimitiveClassDescImpl(descriptor) ? new PrimitiveClassDescImpl(descriptor)
@ -157,8 +157,9 @@ public interface ClassDesc
default ClassDesc arrayType() { default ClassDesc arrayType() {
int depth = ConstantUtils.arrayDepth(descriptorString()); int depth = ConstantUtils.arrayDepth(descriptorString());
if (depth >= ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS) { if (depth >= ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS) {
throw new IllegalStateException(String.format("Cannot create an array type descriptor with more than %d dimensions", throw new IllegalStateException(
ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS)); "Cannot create an array type descriptor with more than " +
ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS + " dimensions");
} }
return arrayType(1); return arrayType(1);
} }
@ -201,7 +202,7 @@ public interface ClassDesc
validateMemberName(nestedName, false); validateMemberName(nestedName, false);
if (!isClassOrInterface()) if (!isClassOrInterface())
throw new IllegalStateException("Outer class is not a class or interface type"); throw new IllegalStateException("Outer class is not a class or interface type");
return ClassDesc.ofDescriptor(String.format("%s$%s;", dropLastChar(descriptorString()), nestedName)); return ClassDesc.ofDescriptor(dropLastChar(descriptorString()) + "$" + nestedName + ";");
} }
/** /**