HADOOP-16345. Fix a potential NPE when instantiating FairCallQueue metrics. Contributed by Erik Krogen.

Author: xkrogen

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/FairCallQueue.java

@@ -377,9 +377,21 @@ public void setDelegate(FairCallQueue<? extends Schedulable> obj) {
       this.revisionNumber++;
     }
 
+    /**
+     * Fetch the current call queue from the weak reference delegate. If there
+     * is no delegate, or the delegate is empty, this will return null.
+     */
+    private FairCallQueue<? extends Schedulable> getCallQueue() {
+      WeakReference<FairCallQueue<? extends Schedulable>> ref = this.delegate;
+      if (ref == null) {
+        return null;
+      }
+      return ref.get();
+    }
+
     @Override
     public int[] getQueueSizes() {
-      FairCallQueue<? extends Schedulable> obj = this.delegate.get();
+      FairCallQueue<? extends Schedulable> obj = getCallQueue();
       if (obj == null) {
         return new int[]{};
       }
@@ -389,7 +401,7 @@ public int[] getQueueSizes() {
 
     @Override
     public long[] getOverflowedCalls() {
-      FairCallQueue<? extends Schedulable> obj = this.delegate.get();
+      FairCallQueue<? extends Schedulable> obj = getCallQueue();
       if (obj == null) {
         return new long[]{};
       }