From 7e42285d9de8a09a0c5f662af8621014cd64dab2 Mon Sep 17 00:00:00 2001
From: Tony Schwartz <tony.schwartz@cinbell.com>
Date: Sat, 2 Nov 2019 11:23:55 -0400
Subject: [PATCH] Fixed issue causing OpenJDK to fail with Illegal Field Name
 error. The DruidCoordinator.this is not yet accessible in the instance inner
 class constructor prior to super invocation completion.

---
 .../druid/server/coordinator/DruidCoordinator.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
index e98e8d38e9c1..106a90e920e2 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
@@ -530,7 +530,7 @@ private void becomeLeader()
       final List<Pair<? extends CoordinatorRunnable, Duration>> coordinatorRunnables = new ArrayList<>();
       coordinatorRunnables.add(
           Pair.of(
-              new CoordinatorHistoricalManagerRunnable(startingLeaderCounter),
+              new CoordinatorHistoricalManagerRunnable(this, startingLeaderCounter),
               config.getCoordinatorPeriod()
           )
       );
@@ -689,11 +689,11 @@ public void run()
 
   private class CoordinatorHistoricalManagerRunnable extends CoordinatorRunnable
   {
-    public CoordinatorHistoricalManagerRunnable(final int startingLeaderCounter)
+    public CoordinatorHistoricalManagerRunnable(final DruidCoordinator druidCoordinator, final int startingLeaderCounter)
     {
       super(
           ImmutableList.of(
-              new DruidCoordinatorSegmentInfoLoader(DruidCoordinator.this),
+              new DruidCoordinatorSegmentInfoLoader(druidCoordinator),
               params -> {
                 List<ImmutableDruidServer> servers = serverInventoryView
                     .getInventory()
@@ -756,11 +756,11 @@ public CoordinatorHistoricalManagerRunnable(final int startingLeaderCounter)
                              .withBalancerReferenceTimestamp(DateTimes.nowUtc())
                              .build();
               },
-              new DruidCoordinatorRuleRunner(DruidCoordinator.this),
+              new DruidCoordinatorRuleRunner(druidCoordinator),
               new DruidCoordinatorCleanupUnneeded(),
-              new DruidCoordinatorCleanupOvershadowed(DruidCoordinator.this),
-              new DruidCoordinatorBalancer(DruidCoordinator.this),
-              new DruidCoordinatorLogger(DruidCoordinator.this)
+              new DruidCoordinatorCleanupOvershadowed(druidCoordinator),
+              new DruidCoordinatorBalancer(druidCoordinator),
+              new DruidCoordinatorLogger(druidCoordinator)
           ),
           startingLeaderCounter
       );