review 4 fixes

Author: DEADripER

modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java

@@ -83,6 +83,7 @@
 import org.apache.ignite.configuration.BinaryConfiguration;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.CollectionConfiguration;
+import org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.MemoryConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
@@ -266,6 +267,7 @@
 import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TX_AWARE_QUERIES_ENABLED;
 import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TX_SERIALIZABLE_ENABLED;
 import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_USER_NAME;
+import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_WAL_MODE;
 import static org.apache.ignite.internal.IgniteVersionUtils.BUILD_TSTAMP_STR;
 import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT;
 import static org.apache.ignite.internal.IgniteVersionUtils.VER;
@@ -1653,6 +1655,11 @@ private void addDataStorageConfigurationAttributes() throws IgniteCheckedExcepti
 
         // Save data storage configuration.
         add(ATTR_DATA_STORAGE_CONFIG, ctx.marshallerContext().jdkMarshaller().marshal(cfg.getDataStorageConfiguration()));
+
+        DataStorageConfiguration dsCfg = cfg.getDataStorageConfiguration();
+
+        ctx.addNodeAttribute(ATTR_WAL_MODE,
+            dsCfg != null ? dsCfg.getWalMode().ordinal() : DataStorageConfiguration.DFLT_WAL_MODE.ordinal());
     }
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java

@@ -486,11 +486,6 @@ private void updateClientNodes(UUID leftNodeId) {
         ctx.addNodeAttribute(ATTR_OFFHEAP_SIZE, requiredOffheap());
         ctx.addNodeAttribute(ATTR_DATA_REGIONS_OFFHEAP_SIZE, configuredOffheap());
 
-        DataStorageConfiguration dsCfg = ctx.config().getDataStorageConfiguration();
-
-        if (CU.isPersistenceEnabled(dsCfg))
-            ctx.addNodeAttribute(ATTR_WAL_MODE, dsCfg.getWalMode().ordinal());
-
         DiscoverySpi spi = getSpi();
 
         discoOrdered = discoOrdered();