Updated source code to include changes noted on errata page (https://docs.google.com/document/d/1mAeEgQu4H4ADxa03k7YaVDjIP5vJBvjVIjg3DIvoc8E/edit?usp=sharing).

Author: jbloch

src/effectivejava/chapter11/item83/Initialization.java

@@ -3,10 +3,10 @@
 // Initialization styles - Pages 333-
 public class Initialization {
 
-    // Normal initialization of an instance field - Page 282
+    // Normal initialization of an instance field4 - Page 282
     private final FieldType field1 = computeFieldValue();
 
-    // Lazy initialization of instance field - synchronized accessor - Page 333
+    // Lazy initialization of instance field4 - synchronized accessor - Page 333
     private FieldType field2;
     private synchronized FieldType getField2() {
         if (field2 == null)
@@ -27,15 +27,17 @@ private static class FieldHolder {
 
     private FieldType getField4() {
         FieldType result = field4;
-        if (result == null) {  // First check (no locking)
-            synchronized(this) {
-                if (field4 == null)  // Second check (with locking)
-                    field4 = result = computeFieldValue();
-            }
+        if (result != null)    // First check (no locking)
+            return result;
+
+        synchronized(this) {
+            if (field4 == null) // Second check (with locking)
+                field4 = computeFieldValue();
+            return field4;
         }
-        return result;
     }
 
+
     // Single-check idiom - can cause repeated initialization! - Page 334
     private volatile FieldType field5;
 

src/effectivejava/chapter6/item39/regularannotation/ExceptionTest.java

@@ -17,5 +17,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface ExceptionTest {
-    Class<? extends Exception>[] value();
+    Class<? extends Throwable>[] value();
 }

src/effectivejava/chapter6/item39/regularannotation/RunTests.java

@@ -29,9 +29,9 @@ public static void main(String[] args) throws Exception {
                 } catch (Throwable wrappedExc) {
                     Throwable exc = wrappedExc.getCause();
                     int oldPassed = passed;
-                    Class<? extends Exception>[] excTypes =
+                    Class<? extends Throwable>[] excTypes =
                             m.getAnnotation(ExceptionTest.class).value();
-                    for (Class<? extends Exception> excType : excTypes) {
+                    for (Class<? extends Throwable> excType : excTypes) {
                         if (excType.isInstance(exc)) {
                             passed++;
                             break;

src/effectivejava/chapter6/item39/repeatableannotation/ExceptionTest.java

@@ -12,5 +12,5 @@
 @Target(ElementType.METHOD)
 @Repeatable(ExceptionTestContainer.class)
 public @interface ExceptionTest {
-    Class<? extends Exception> value();
+    Class<? extends Throwable> value();
 }