bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sigar-1.6'

This commit is contained in:
Doug MacEachern 2010-05-20 11:48:15 -07:00
parent bee9eb97a2 d1a4f8e55e
commit 282c008aea
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bindings/java/src/org/hyperic/sigar/win32/EventLogThread.java
View File

@ -157,13 +157,26 @@ public class EventLogThread implements Runnable {
// XXX: Using the waitForChange() method would be a // XXX: Using the waitForChange() method would be a
// cleaner way to go, but we cannot interrupt // cleaner way to go, but we cannot interrupt
// a native system call. // a native system call.
boolean logChanged = false;
int lastEvent = log.getNewestRecord(); int lastEvent = log.getNewestRecord();
if (lastEvent < curEvent) { if (lastEvent < curEvent) {
logChanged = true;
}
else if ((lastEvent == curEvent) && (lastEvent != -1)) {
//example: clearing the Security log generates an event
//and clear it again before any new events come in
try {
log.read(lastEvent);
} catch (Win32Exception e) {
logChanged = true;
}
}
if (logChanged) {
logger.debug(this.logName + " EventLog has changed, re-opening"); logger.debug(this.logName + " EventLog has changed, re-opening");
try { log.close(); } catch (Win32Exception e) {} try { log.close(); } catch (Win32Exception e) {}
log.open(this.logName); log.open(this.logName);
curEvent = log.getOldestRecord(); curEvent = 0; //all events in the log are new to us after being cleared
lastEvent = log.getNewestRecord();
} }
if (lastEvent > curEvent) { if (lastEvent > curEvent) {