diff -r faf3a3b0bab6 -r de154169948b src/jdk.jfr/share/classes/jdk/jfr/consumer/ConstantMap.java
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/ConstantMap.java	Thu Jul 11 02:18:31 2019 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/ConstantMap.java	Thu Jul 11 02:21:18 2019 +0200
@@ -174,8 +174,8 @@
     }
 
     public void putResolved(long id, Object object) {
+        objects.put(id, object);
         objects.setId(id, RESOLUTION_FINISHED);
-        objects.put(id, object);
     }
 
     public void setAllResolved(boolean allResolved) {