Bug 516592 - LogReaderService.getLog() is reverse order of javadoc
Changed storeEntry() to store the history in a way that it removes the
old entries when it is full.
Updated testLogHistory1() to account the change done in implementation
Change-Id: I3455a0cf23368c19c20d52659491b21a581c3a04
Signed-off-by: Anjum Fatima <anjum.eclipse@gmail.com>
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
index cfe80cd..04d9091 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
@@ -167,15 +167,15 @@
for (int i = 0; i < 9; i++) {
testLog.log(LogService.LOG_WARNING, String.valueOf(i));
}
- assertEquals("Wrong number of logs.", 9, countLogEntries(testReader.getLog(), 0));
+ assertEquals("Wrong number of logs.", 9, countLogEntries(testReader.getLog(), 8));
// log 9 more things
for (int i = 9; i < 18; i++) {
testLog.log(LogService.LOG_WARNING, String.valueOf(i));
}
- // should only be the last 10 logs (8 - 17)
- assertEquals("Wrong number of logs.", 10, countLogEntries(testReader.getLog(), 8));
+ // should only be the last 10 logs (17-8)
+ assertEquals("Wrong number of logs.", 10, countLogEntries(testReader.getLog(), 17));
} finally {
try {
equinox.stop();
@@ -215,7 +215,7 @@
while (logEntries.hasMoreElements()) {
LogEntry entry = (LogEntry) logEntries.nextElement();
assertEquals("Wrong log message.", String.valueOf(startingMessage), entry.getMessage());
- startingMessage++;
+ startingMessage--;
count++;
}
return count;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java
index 2813efc..e018dd0 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/ExtendedLogReaderServiceFactory.java
@@ -227,9 +227,9 @@
if (history != null) {
synchronized (history) {
if (history.size() == maxHistory) {
- history.removeFirst();
+ history.removeLast();
}
- history.addLast(logEntry);
+ history.addFirst(logEntry);
}
}
}
