diff options
| author |  Oszkar Semerath <Oszkar Semerath@DESKTOP-DNR7JQ7> | 2021-07-14 00:43:01 +0200 |
|---|---|---|
| committer | Oszkar Semerath <Oszkar Semerath@DESKTOP-DNR7JQ7> | 2021-07-14 00:43:01 +0200 |
| commit | aef8f9a5d24a7e92e4ca8d67fe3969cc34423207 (patch) | |
| tree | 4b86f7e2a535f5d9ac439d216e369c75fb6c82fe /Solvers | |
| parent | npe fix (diff) | |
| download | VIATRA-Generator-aef8f9a5d24a7e92e4ca8d67fe3969cc34423207.tar.gz VIATRA-Generator-aef8f9a5d24a7e92e4ca8d67fe3969cc34423207.tar.zst VIATRA-Generator-aef8f9a5d24a7e92e4ca8d67fe3969cc34423207.zip | |
npe fix 2
Diffstat (limited to 'Solvers')
2 files changed, 7 insertions, 5 deletions
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java index daff1af1..539f9d65 100644 --- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java +++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java | |||
| @@ -39,10 +39,12 @@ public class ImmutableNode<KEY, VALUE> extends Node<KEY, VALUE> { | |||
| 39 | @SuppressWarnings("unchecked") | 39 | @SuppressWarnings("unchecked") |
| 40 | static <KEY,VALUE> ImmutableNode<KEY,VALUE> constructImmutable(MutableNode<KEY,VALUE> node, Map<Node<KEY, VALUE>, ImmutableNode<KEY, VALUE>> cache) { | 40 | static <KEY,VALUE> ImmutableNode<KEY,VALUE> constructImmutable(MutableNode<KEY,VALUE> node, Map<Node<KEY, VALUE>, ImmutableNode<KEY, VALUE>> cache) { |
| 41 | // 1. try to return from cache | 41 | // 1. try to return from cache |
| 42 | ImmutableNode<KEY, VALUE> cachedResult = cache.get(node); | 42 | if(cache != null) { |
| 43 | if(cachedResult != null) { | 43 | ImmutableNode<KEY, VALUE> cachedResult = cache.get(node); |
| 44 | // 1.1 Already cached, return from cache. | 44 | if(cachedResult != null) { |
| 45 | return cachedResult; | 45 | // 1.1 Already cached, return from cache. |
| 46 | return cachedResult; | ||
| 47 | } | ||
| 46 | } | 48 | } |
| 47 | 49 | ||
| 48 | // 2. otherwise construct a new ImmutableNode | 50 | // 2. otherwise construct a new ImmutableNode |
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MutableNode.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MutableNode.java index 6e177d9f..4a276109 100644 --- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MutableNode.java +++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MutableNode.java | |||
| @@ -338,7 +338,7 @@ public class MutableNode<KEY,VALUE> extends Node<KEY,VALUE> { | |||
| 338 | protected void updateHash() { | 338 | protected void updateHash() { |
| 339 | final int prime = 31; | 339 | final int prime = 31; |
| 340 | int result = 1; | 340 | int result = 1; |
| 341 | result = prime * result + Arrays.deepHashCode(content); | 341 | //result = prime * result + Arrays.deepHashCode(content); |
| 342 | this.cachedHash = result; | 342 | this.cachedHash = result; |
| 343 | } | 343 | } |
| 344 | 344 | ||