Projects >> wro4j >>6557c3de96d07a4076633a237cc6960aeed53b68

Chunk
Conflicting content 
      public void propertyChange(final PropertyChangeEvent event) {
        // reset cache headers when any property is changed in order to avoid browser caching
        initHeaderValues();
<<<<<<< HEAD
        final long value = Long.valueOf(String.valueOf(event.getNewValue())).longValue();
        wroManagerFactory.onCachePeriodChanged(value);
=======
        wroManagerFactory.onCachePeriodChanged(valueAsLong(event.getNewValue()));
>>>>>>> fc26ad5f758cdf60b2a3e47afa1d62b449e55994
      }
    });
    wroConfiguration.registerModelUpdatePeriodChangeListener(new PropertyChangeListener() {
Solution content 
      public void propertyChange(final PropertyChangeEvent event) {
        // reset cache headers when any property is changed in order to avoid browser caching
        initHeaderValues();
        wroManagerFactory.onCachePeriodChanged(valueAsLong(event.getNewValue()));
      }
    });
    wroConfiguration.registerModelUpdatePeriodChangeListener(new PropertyChangeListener() {
File
WroFilter.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    wroConfiguration.registerModelUpdatePeriodChangeListener(new PropertyChangeListener() {
      public void propertyChange(final PropertyChangeEvent event) {
        initHeaderValues();
<<<<<<< HEAD
        final long value = Long.valueOf(String.valueOf(event.getNewValue())).longValue();
        wroManagerFactory.onModelPeriodChanged(value);
=======
        wroManagerFactory.onModelPeriodChanged(valueAsLong(event.getNewValue()));
>>>>>>> fc26ad5f758cdf60b2a3e47afa1d62b449e55994
      }
    });
    LOG.debug("Cache & Model change listeners were registered");
Solution content 
    wroConfiguration.registerModelUpdatePeriodChangeListener(new PropertyChangeListener() {
      public void propertyChange(final PropertyChangeEvent event) {
        initHeaderValues();
        wroManagerFactory.onModelPeriodChanged(valueAsLong(event.getNewValue()));
      }
    });
    LOG.debug("Cache & Model change listeners were registered");
File
WroFilter.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable