fix(orca): fix NPE caused by late assignment of pipeline id

spinnaker · Aug 23, 2017 · ceed4c9 · ceed4c9
1 parent 1e4c9cf
commit ceed4c9
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/orca-core/src/main/groovy/com/netflix/spinnaker/orca/pipeline/model/AlertOnAccessMap.java b/orca-core/src/main/groovy/com/netflix/spinnaker/orca/pipeline/model/AlertOnAccessMap.java
@@ -25,18 +25,14 @@
 
 class AlertOnAccessMap<E extends Execution<E>> extends ForwardingMap<String, Object> {
 
+  private final Execution<E> execution;
   private final Map<String, Object> delegate;
   private final Registry registry;
-  private final Id counterId;
 
-  AlertOnAccessMap(Execution<E> execution, Registry registry, Map<String, Object> delegate) {
+  private AlertOnAccessMap(Execution<E> execution, Registry registry, Map<String, Object> delegate) {
+    this.execution = execution;
     this.registry = registry;
     this.delegate = delegate;
-    counterId = registry
-      .createId("global.context.access")
-      .withTag("execution", execution.getId())
-      .withTag("application", execution.getApplication())
-      .withTag("name", execution.getName());
   }
 
   AlertOnAccessMap(Execution<E> execution, Registry registry) {
@@ -46,8 +42,14 @@ class AlertOnAccessMap<E extends Execution<E>> extends ForwardingMap<String, Obj
   @Override protected Map<String, Object> delegate() { return delegate; }
 
   @Override public Object get(@Nullable Object key) {
+    Id counterId = registry
+      .createId("global.context.access")
+      .withTag("execution", execution.getId())
+      .withTag("application", execution.getApplication())
+      .withTag("name", execution.getName())
+      .withTag("key", String.valueOf(key));
     registry
-      .counter(counterId.withTag("key", String.valueOf(key)))
+      .counter(counterId)
       .increment();
     return super.get(key);
   }