root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fix bug in trace repository 

When reverse==false we have to be careful to remove the right element
when capacity is reached.
This commit is contained in:
Dave Syer 2015-04-09 13:11:59 +01:00
parent 8ef21b31ad
commit 8cdff1cf70
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/InMemoryTraceRepository.java
View File

@ -63,7 +63,7 @@ public class InMemoryTraceRepository implements TraceRepository {
Trace trace = new Trace(new Date(), map); Trace trace = new Trace(new Date(), map);
synchronized (this.traces) { synchronized (this.traces) {
while (this.traces.size() >= this.capacity) { while (this.traces.size() >= this.capacity) {
this.traces.remove(this.capacity - 1); this.traces.remove(this.reverse ? this.capacity - 1 : 0);
} }
if (this.reverse) { if (this.reverse) {
this.traces.add(0, trace); this.traces.add(0, trace);

14
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java
View File

@ -41,6 +41,20 @@ public class InMemoryTraceRepositoryTests {
List<Trace> traces = this.repository.findAll(); List<Trace> traces = this.repository.findAll();
assertEquals(2, traces.size()); assertEquals(2, traces.size());
assertEquals("bar", traces.get(0).getInfo().get("bar")); assertEquals("bar", traces.get(0).getInfo().get("bar"));
assertEquals("foo", traces.get(1).getInfo().get("bar"));
}
@Test
public void reverseFalse() {
this.repository.setReverse(false);
this.repository.setCapacity(2);
this.repository.add(Collections.<String, Object> singletonMap("foo", "bar"));
this.repository.add(Collections.<String, Object> singletonMap("bar", "foo"));
this.repository.add(Collections.<String, Object> singletonMap("bar", "bar"));
List<Trace> traces = this.repository.findAll();
assertEquals(2, traces.size());
assertEquals("bar", traces.get(1).getInfo().get("bar"));
assertEquals("foo", traces.get(0).getInfo().get("bar"));
} }
} }