Skip to content
This repository has been archived by the owner on Aug 23, 2020. It is now read-only.

Local_Snapshots_Pruning_Enabled should depend on Local_Snapshots_Enabled config #1222

Merged
merged 1 commit into from
Dec 7, 2018
Merged

Local_Snapshots_Pruning_Enabled should depend on Local_Snapshots_Enabled config #1222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/main/java/com/iota/iri/conf/BaseIotaConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package com.iota.iri.conf;

import com.iota.iri.IRI;
import com.iota.iri.utils.IotaUtils;

import java.util.ArrayList;
import java.util.List;

import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.iota.iri.IRI;
import com.iota.iri.utils.IotaUtils;
import org.apache.commons.lang3.ArrayUtils;

import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.ArrayUtils;

/*
Note: the fields in this class are being deserialized from Jackson so they must follow Java Bean convention.
Expand Down Expand Up @@ -465,7 +467,7 @@ protected void setLocalSnapshotsEnabled(boolean localSnapshotsEnabled) {

@Override
public boolean getLocalSnapshotsPruningEnabled() {
return this.localSnapshotsPruningEnabled;
return this.localSnapshotsEnabled && this.localSnapshotsPruningEnabled;
}

@JsonProperty
Expand Down