/**
 *
 * Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License"); You may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at:
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */
package com.speedment.internal.util;

import static java.util.Objects.requireNonNull;
import java.util.function.Supplier;

/**
 * Generic lazy initialization class. The supplier must produce a non-null
 * value.
 *
 * This class is thread safe. The Supplier is guaranteed to be called exactly
 * one time following one or several calls to 
 * {@link  #getOrCompute(java.util.function.Supplier) } by any number of
 * threads.
 *
 * @author pemi
 * @param <T> the type of the lazy initialized value
 */
public final class Lazy<T> {

    private T value;

    public T getOrCompute(Supplier<T> supplier) {
        return value == null ? maybeCompute(supplier) : value;
    }

    private synchronized T maybeCompute(Supplier<T> supplier) {
        if (value == null) {
            value = requireNonNull(supplier.get());
        }
        return value;
    }

    public static <T> Lazy<T> create() {
        return new Lazy<>();
    }
}

@@ -1167,16 +1167,25 @@
 private 
+volatile 
 T value;
@@ -1185,16 +1185,16 @@
  value;%0A
-
 %0A    pub
@@ -1244,28 +1244,155 @@
         
-return value
+// With this local variable, we only need to do one volatile read most of the times%0A        final T result = value;  %0A        return result
  == null
@@ -1419,21 +1419,22 @@
 lier) : 
-value
+result
 ;%0A    %7D%0A

Fix Lazy volatile bug