save a reference to log name and pass around internally

bindings/java/src/jni/win32/eventlog.c

@@ -107,7 +107,7 @@ static int get_formatted_message(EVENTLOGRECORD *pevlr, char *dllfile,
     return 0;
 }
 
-JNIEXPORT void SIGAR_JNI(win32_EventLog_open)
+JNIEXPORT void SIGAR_JNI(win32_EventLog_openlog)
 (JNIEnv *env, jobject obj, jstring lpSourceName)
 {
     HANDLE h;
@@ -164,7 +164,7 @@ JNIEXPORT jint SIGAR_JNI(win32_EventLog_getOldestRecord)
     return oldest;
 }
 
-JNIEXPORT jobject SIGAR_JNI(win32_EventLog_read)
+JNIEXPORT jobject SIGAR_JNI(win32_EventLog_readlog)
 (JNIEnv *env, jobject obj, jstring jname, jint recordOffset)
 {
     EVENTLOGRECORD *pevlr;

bindings/java/src/net/hyperic/sigar/win32/EventLog.java

@@ -18,6 +18,7 @@ public class EventLog extends Win32 {
 
     // Event log timeouts
     public static final int EVENTLOG_WAIT_INFINITE    = -1;
+    private String name;
 
     /**
      * Create an event log.
@@ -30,7 +31,12 @@ public class EventLog extends Win32 {
      *                     Application, System or Security.
      * @exception Win32Exception If opening the event log fails.
      */
-    public native void open(String lpSourceName) throws Win32Exception;
+    public void open(String name) throws Win32Exception {
+        this.name = name;
+        openlog(name);
+    }
+
+    public native void openlog(String name) throws Win32Exception;
 
     /**
      * Close the event log.
@@ -65,13 +71,18 @@ public class EventLog extends Win32 {
      * EVENTLOG_SEEK_READ flag, no sequential reading is currently
      * supported.
      * 
-     * @param logName The event log name
      * @param recordOffset The record offset to read.
      * @exception Win32Exception If the event log is not open, or
      *                           if the specified record could not be
      *                           found
      */
-    public native EventLogRecord read(String logName, int recordOffset)
+    public EventLogRecord read(int recordOffset)
+        throws Win32Exception {
+
+        return readlog(this.name, recordOffset);
+    }
+
+    private native EventLogRecord readlog(String name, int recordOffset)
         throws Win32Exception;
 
     /**

bindings/java/src/net/hyperic/sigar/win32/EventLogThread.java

@@ -101,7 +101,7 @@ public class EventLogThread implements Runnable {
             EventLogRecord record;
 
             try {
-                record = log.read(this.logName, i);
+                record = log.read(i);
             } catch (Win32Exception e) {
                 logger.error("Unable to read event id " + i + ": " + e);
                 continue;