| Chunk |
|---|
| Conflicting content |
|---|
/**
* Returns if heuristic freshness caching is in enabled
<<<<<<< HEAD
=======
* @return
>>>>>>> c76574f9476acab626f711ff966aee65a35d3845
*/
public boolean isHeuristicCachingEnabled() {
return heuristicCachingEnabled; |
| Solution content |
|---|
/**
* Returns if heuristic freshness caching is in enabled
*/
public boolean isHeuristicCachingEnabled() {
return heuristicCachingEnabled; |
| File |
|---|
| CacheConfig.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
/**
* Set if heuristic freshness caching is enabled
<<<<<<< HEAD
=======
* @param heursiticCachingEnabled
>>>>>>> c76574f9476acab626f711ff966aee65a35d3845
*/
public void setHeuristicCachingEnabled(boolean heuristicCachingEnabled) {
this.heuristicCachingEnabled = heuristicCachingEnabled; |
| Solution content |
|---|
/**
* Set if heuristic freshness caching is enabled
*/
public void setHeuristicCachingEnabled(boolean heuristicCachingEnabled) {
this.heuristicCachingEnabled = heuristicCachingEnabled; |
| File |
|---|
| CacheConfig.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD
=======
/**
* Returns coefficient used in heuristic freshness caching
* @return
>>>>>>> c76574f9476acab626f711ff966aee65a35d3845
*/
public float getHeuristicCoefficient() {
return heuristicCoefficient; |
| Solution content |
|---|
/**
* Returns coefficient used in heuristic freshness caching
*/
public float getHeuristicCoefficient() {
return heuristicCoefficient; |
| File |
|---|
| CacheConfig.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
/**
* Set coefficient to be used in heuristic freshness caching
<<<<<<< HEAD
=======
* @param heuristicCoefficient
>>>>>>> c76574f9476acab626f711ff966aee65a35d3845
*/
public void setHeuristicCoefficient(float heuristicCoefficient) {
this.heuristicCoefficient = heuristicCoefficient; |
| Solution content |
|---|
/**
* Set coefficient to be used in heuristic freshness caching
*/
public void setHeuristicCoefficient(float heuristicCoefficient) {
this.heuristicCoefficient = heuristicCoefficient; |
| File |
|---|
| CacheConfig.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
/**
* Get the default lifetime to be used if heuristic freshness calculation is
* not possible
<<<<<<< HEAD
=======
* @return
>>>>>>> c76574f9476acab626f711ff966aee65a35d3845
*/
public long getHeuristicDefaultLifetime() {
return heuristicDefaultLifetime; |
| Solution content |
|---|
/**
* Get the default lifetime to be used if heuristic freshness calculation is
* not possible
*/
public long getHeuristicDefaultLifetime() {
return heuristicDefaultLifetime; |
| File |
|---|
| CacheConfig.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
/**
* Set default lifetime to be used if heuristic freshness calculation is not possible
<<<<<<< HEAD
=======
* @param heuristicDefaultLifetime
>>>>>>> c76574f9476acab626f711ff966aee65a35d3845
*/
public void setHeuristicDefaultLifetime(long heuristicDefaultLifetime) {
this.heuristicDefaultLifetime = heuristicDefaultLifetime; |
| Solution content |
|---|
/**
* Set default lifetime to be used if heuristic freshness calculation is not possible
*/
public void setHeuristicDefaultLifetime(long heuristicDefaultLifetime) {
this.heuristicDefaultLifetime = heuristicDefaultLifetime; |
| File |
|---|
| CacheConfig.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |