Skip to content
Permalink
Browse files
8265375: Bootcycle builds fail with StackOverflowError in cldrconverter
Reviewed-by: joehw
  • Loading branch information
naotoj committed Apr 16, 2021
1 parent c108e7a commit ff4997014fe5462dca2b313f3f483400ffee5b62
Showing with 5 additions and 1 deletion.
  1. +5 −1 make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1038,6 +1038,10 @@ private static void setupBaseLocales(String localeList) {
Objects.nonNull(p) &&
!candidates.get(i+1).equals(p)) {
List<Locale> applied = candidates.subList(0, i+1);
if (applied.contains(p)) {
// avoid circular recursion (could happen with nb/no case)
continue;
}
applied.addAll(applyParentLocales(baseName, defCon.getCandidateLocales(baseName, p)));
return applied;
}

1 comment on commit ff49970

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on ff49970 Apr 16, 2021

Please sign in to comment.