Skip to content

Commit

Permalink
Merge branch 'issue/5055-make-default-MustBeFresh-false'. Refs #5055.
Browse files Browse the repository at this point in the history
  • Loading branch information
jefft0 committed Nov 25, 2019
2 parents bc5fde3 + ad26714 commit ac49f5d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
jNDN v0.23 (2019-10-04)
Interim changes since jNDN v0.23 (2019-11-25)
---------------------------------------------

Changes
* https://redmine.named-data.net/issues/5055 In Interest, changed the
MustBeFresh default value to false.

jNDN v0.23 (2019-10-04)
-----------------------

Changes
* https://redmine.named-data.net/issues/4813 In Face, added putNack().
* https://github.com/named-data/jndn/pull/24 Aimd pipelining in Segment fetcher (Thanks, Ritik!)
Expand Down
6 changes: 3 additions & 3 deletions src/net/named_data/jndn/Interest.java
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ public class Interest implements ChangeCountable {
getChildSelector() { return childSelector_; }

/**
* Get the must be fresh flag. If not specified, the default is true.
* Get the must be fresh flag. If not specified, the default is false.
* @return The must be fresh flag.
*/
public final boolean
Expand Down Expand Up @@ -555,7 +555,7 @@ else if (!linkWireEncoding_.isNull()) {
/**
* Set the MustBeFresh flag.
* @param mustBeFresh True if the content must be fresh, otherwise false. If
* you do not set this flag, the default value is true.
* you do not set this flag, the default value is false.
* @return This Interest so that you can chain calls to update values.
*/
public final Interest
Expand Down Expand Up @@ -996,7 +996,7 @@ else if (!linkWireEncoding_.isNull()) {
private final ChangeCounter keyLocator_ = new ChangeCounter(new KeyLocator());
private final ChangeCounter exclude_ = new ChangeCounter(new Exclude());
private int childSelector_ = -1;
private boolean mustBeFresh_ = true;
private boolean mustBeFresh_ = false;
private double interestLifetimeMilliseconds_ = -1;
private Blob nonce_ = new Blob();
private long getNonceChangeCount_ = 0;
Expand Down
1 change: 1 addition & 0 deletions src/net/named_data/jndn/Node.java
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,7 @@ public static class Info {

Interest commandInterest = new Interest();
commandInterest.setCanBePrefix(true);
commandInterest.setMustBeFresh(true);

// Determine whether to use remote prefix registration.
boolean faceIsLocal;
Expand Down

0 comments on commit ac49f5d

Please sign in to comment.