Fixed Ethash events firing

ethereum · Jun 13, 2018 · 6488ed5 · 6488ed5
1 parent cb5f167
commit 6488ed5
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/ethereumj-core/src/main/java/org/ethereum/mine/Ethash.java b/ethereumj-core/src/main/java/org/ethereum/mine/Ethash.java
@@ -112,11 +112,14 @@ public Ethash(SystemProperties config, long blockNumber) {
         }
     }
 
-    public int[] getCacheLight() {
-        fireDatatasetStatusUpdate(DATASET_PREPARE);
-        int[] res = getCacheLightImpl();
-        fireDatatasetStatusUpdate(DATASET_READY);
-        return res;
+    public synchronized int[] getCacheLight() {
+        if (cacheLight == null) {
+            fireDatatasetStatusUpdate(DATASET_PREPARE);
+            getCacheLightImpl();
+            fireDatatasetStatusUpdate(DATASET_READY);
+        }
+
+        return cacheLight;
     }
 
     /**
@@ -168,8 +171,8 @@ private synchronized int[] getCacheLightImpl() {
     }
 
     public synchronized int[] getFullDataset() {
-        fireDatatasetStatusUpdate(DATASET_PREPARE);
         if (fullData == null) {
+            fireDatatasetStatusUpdate(DATASET_PREPARE);
             File file = new File(config.ethashDir(), "mine-dag.dat");
             if (fileCacheEnabled && file.canRead()) {
                 fireDatatasetStatusUpdate(FULL_DATASET_LOAD_START);
@@ -208,8 +211,8 @@ public synchronized int[] getFullDataset() {
                 }
                 fireDatatasetStatusUpdate(FULL_DATASET_GENERATED);
             }
+            fireDatatasetStatusUpdate(DATASET_READY);
         }
-        fireDatatasetStatusUpdate(DATASET_READY);
         return fullData;
     }