Delay initializing the CacheBuilder logger until it is needed.

cpovirk · Google Java Core Libraries · commit de627039879d · 2023-06-23T10:00:11.000-07:00
This is progress toward addressing the Java agent / `premain` problem discussed in #6566. (And we're careful to avoid lambdas and method references so as to avoid #6565.) RELNOTES=Fixed some problems with [using Guava from a Java Agent](#6566). (But we don't test that configuration, and we don't know how well we'll be able to keep it working.) PiperOrigin-RevId: 542887194
diff --git a/android/guava/src/com/google/common/cache/CacheBuilder.java b/android/guava/src/com/google/common/cache/CacheBuilder.java
@@ -271,7 +271,10 @@ public long read() {
         }
       };
 
-  private static final Logger logger = Logger.getLogger(CacheBuilder.class.getName());
+  // We use a holder class to delay initialization: https://github.com/google/guava/issues/6566
+  private static final class LoggerHolder {
+    static final Logger logger = Logger.getLogger(CacheBuilder.class.getName());
+  }
 
   static final int UNSET_INT = -1;
 
@@ -950,7 +953,8 @@ private void checkWeightWithWeigher() {
         checkState(maximumWeight != UNSET_INT, "weigher requires maximumWeight");
       } else {
         if (maximumWeight == UNSET_INT) {
-          logger.log(Level.WARNING, "ignoring weigher specified without maximumWeight");
+          LoggerHolder.logger.log(
+              Level.WARNING, "ignoring weigher specified without maximumWeight");
         }
       }
     }
diff --git a/guava/src/com/google/common/cache/CacheBuilder.java b/guava/src/com/google/common/cache/CacheBuilder.java
@@ -272,7 +272,10 @@ public long read() {
         }
       };
 
-  private static final Logger logger = Logger.getLogger(CacheBuilder.class.getName());
+  // We use a holder class to delay initialization: https://github.com/google/guava/issues/6566
+  private static final class LoggerHolder {
+    static final Logger logger = Logger.getLogger(CacheBuilder.class.getName());
+  }
 
   static final int UNSET_INT = -1;
 
@@ -1056,7 +1059,8 @@ private void checkWeightWithWeigher() {
         checkState(maximumWeight != UNSET_INT, "weigher requires maximumWeight");
       } else {
         if (maximumWeight == UNSET_INT) {
-          logger.log(Level.WARNING, "ignoring weigher specified without maximumWeight");
+          LoggerHolder.logger.log(
+              Level.WARNING, "ignoring weigher specified without maximumWeight");
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,10 @@ public long read() {`
`271`	`271`	`}`
`272`	`272`	`};`
`273`	`273`
`274`		`- private static final Logger logger = Logger.getLogger(CacheBuilder.class.getName());`
	`274`	`+ // We use a holder class to delay initialization: https://github.com/google/guava/issues/6566`
	`275`	`+ private static final class LoggerHolder {`
	`276`	`+ static final Logger logger = Logger.getLogger(CacheBuilder.class.getName());`
	`277`	`+ }`
`275`	`278`
`276`	`279`	`static final int UNSET_INT = -1;`
`277`	`280`
`@@ -950,7 +953,8 @@ private void checkWeightWithWeigher() {`
`950`	`953`	`checkState(maximumWeight != UNSET_INT, "weigher requires maximumWeight");`
`951`	`954`	`} else {`
`952`	`955`	`if (maximumWeight == UNSET_INT) {`
`953`		`- logger.log(Level.WARNING, "ignoring weigher specified without maximumWeight");`
	`956`	`+ LoggerHolder.logger.log(`
	`957`	`+ Level.WARNING, "ignoring weigher specified without maximumWeight");`
`954`	`958`	`}`
`955`	`959`	`}`
`956`	`960`	`}`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,10 @@ public long read() {`
`272`	`272`	`}`
`273`	`273`	`};`
`274`	`274`
`275`		`- private static final Logger logger = Logger.getLogger(CacheBuilder.class.getName());`
	`275`	`+ // We use a holder class to delay initialization: https://github.com/google/guava/issues/6566`
	`276`	`+ private static final class LoggerHolder {`
	`277`	`+ static final Logger logger = Logger.getLogger(CacheBuilder.class.getName());`
	`278`	`+ }`
`276`	`279`
`277`	`280`	`static final int UNSET_INT = -1;`
`278`	`281`
`@@ -1056,7 +1059,8 @@ private void checkWeightWithWeigher() {`
`1056`	`1059`	`checkState(maximumWeight != UNSET_INT, "weigher requires maximumWeight");`
`1057`	`1060`	`} else {`
`1058`	`1061`	`if (maximumWeight == UNSET_INT) {`
`1059`		`- logger.log(Level.WARNING, "ignoring weigher specified without maximumWeight");`
	`1062`	`+ LoggerHolder.logger.log(`
	`1063`	`+ Level.WARNING, "ignoring weigher specified without maximumWeight");`
`1060`	`1064`	`}`
`1061`	`1065`	`}`
`1062`	`1066`	`}`