Prevent reloading of default message instance when an error is encoun…

…tered This fixes #119 PiperOrigin-RevId: 554536199
google · Aug 7, 2023 · 86114e0 · 86114e0
1 parent eb75304
commit 86114e0
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/common/src/main/java/dev/cel/common/internal/DefaultInstanceMessageFactory.java b/common/src/main/java/dev/cel/common/internal/DefaultInstanceMessageFactory.java
@@ -196,16 +196,18 @@ private boolean hasConflictingClassName(FileDescriptor file, String name) {
   private static final class LazyGeneratedMessageDefaultInstance {
     private final String fullClassName;
     private volatile Message defaultInstance = null;
+    private volatile boolean loaded = false;
 
     public LazyGeneratedMessageDefaultInstance(String fullClassName) {
       this.fullClassName = fullClassName;
     }
 
     public Message getDefaultInstance() {
-      if (defaultInstance == null) {
+      if (!loaded) {
         synchronized (this) {
-          if (defaultInstance == null) {
+          if (!loaded) {
             loadDefaultInstance();
+            loaded = true;
           }
         }
       }