From 153a9e25992d2318c7f6f242d52c3f54d42dad1a Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 19 Sep 2018 12:46:46 +0200
Subject: [PATCH] Fix TypedefEffectiveStatementImpl double-checked load

We really need a volatile read here to make things alright, make
the field volatile.

Change-Id: Id04917a04f9f1fdba6ded2c773571d90106e877f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java
index 89578a31d8..c2df109cec 100644
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java
@@ -42,7 +42,7 @@ final class TypedefEffectiveStatementImpl extends AbstractEffectiveSchemaNode<Ty
 
     private final TypeDefinition<?> typeDefinition;
 
-    private TypeEffectiveStatement<TypeStatement> typeStatement;
+    private volatile TypeEffectiveStatement<TypeStatement> typeStatement;
 
     TypedefEffectiveStatementImpl(final StmtContext<QName, TypedefStatement, ?> ctx) {
         super(ctx);
@@ -95,8 +95,7 @@ final class TypedefEffectiveStatementImpl extends AbstractEffectiveSchemaNode<Ty
             synchronized (this) {
                 ret = typeStatement;
                 if (ret == null) {
-                    ret = new ProxyTypeEffectiveStatement();
-                    typeStatement = ret;
+                    typeStatement = ret = new ProxyTypeEffectiveStatement();
                 }
             }
         }
-- 
2.36.6