X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-reactor%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Freactor%2FReactorStmtCtx.java;h=5e9f5983e2f2e697cb465a7798414a659adc17f4;hb=0735f709c996762a2ac65338459c465bffc4dbcf;hp=a7f3941042514ddce09e8ca85b954ae8c8f3d9e4;hpb=b1c563b20a316b45640668b748c02963bab95814;p=yangtools.git
diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
index a7f3941042..5e9f5983e2 100644
--- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
+++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
@@ -154,8 +154,8 @@ abstract class ReactorStmtCtx, E extends Effec
// SchemaPath cache for use with SubstatementContext and InferredStatementContext. This hurts RootStatementContext
// a bit in terms of size -- but those are only a few and SchemaPath is on its way out anyway.
- @Deprecated
- private volatile SchemaPath schemaPath;
+ // FIXME: this should become 'QName'
+ private SchemaPath schemaPath;
ReactorStmtCtx() {
// Empty on purpose
@@ -559,19 +559,13 @@ abstract class ReactorStmtCtx, E extends Effec
// Exists only to support {SubstatementContext,InferredStatementContext}.schemaPath()
@Deprecated
final @Nullable SchemaPath substatementGetSchemaPath() {
- SchemaPath local = schemaPath;
- if (local == null) {
- synchronized (this) {
- local = schemaPath;
- if (local == null) {
- schemaPath = local = createSchemaPath((StatementContextBase, ?, ?>) coerceParentContext());
- }
- }
+ if (schemaPath == null) {
+ schemaPath = createSchemaPath((StatementContextBase, ?, ?>) coerceParentContext());
}
-
- return local;
+ return schemaPath;
}
+ // FIXME: 7.0.0: this method's logic needs to be moved to the respective StatementSupport classes
@Deprecated
private SchemaPath createSchemaPath(final StatementContextBase, ?, ?> parent) {
final SchemaPath parentPath = parent.getSchemaPath();