From 692f5a43ea673649434072067c0b467db1b347dc Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@vmware.com>
Date: Fri, 8 Apr 2011 10:48:14 -0700
Subject: [PATCH 1/3] fix invalid who.user assertion on win32

---
 bindings/java/src/org/hyperic/sigar/test/TestWho.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bindings/java/src/org/hyperic/sigar/test/TestWho.java b/bindings/java/src/org/hyperic/sigar/test/TestWho.java
index 39d5822b..78f94768 100644
--- a/bindings/java/src/org/hyperic/sigar/test/TestWho.java
+++ b/bindings/java/src/org/hyperic/sigar/test/TestWho.java
@@ -19,6 +19,7 @@ package org.hyperic.sigar.test;
 import java.util.Date;
 
 import org.hyperic.sigar.SigarException;
+import org.hyperic.sigar.SigarLoader;
 import org.hyperic.sigar.Who;
 
 public class TestWho extends SigarTestCase {
@@ -39,7 +40,9 @@ public class TestWho extends SigarTestCase {
                     who[i].getDevice() + "\t" +
                     new Date(who[i].getTime() * 1000) + "\t" +
                     host);
-            assertLengthTrace("user", who[i].getUser());
+            if (!SigarLoader.IS_WIN32) {
+                assertLengthTrace("user", who[i].getUser());
+            }
         }
     }
 }

From 87f0aa7f6f81750915f3fe1bc3281029ed63b9ae Mon Sep 17 00:00:00 2001
From: Trevor Pounds <trevor.pounds@gmail.com>
Date: Wed, 22 Sep 2010 11:24:29 -0500
Subject: [PATCH 2/3] (SIGAR-226) fix missing *.cpp files from source archive

---
 bindings/java/build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bindings/java/build.xml b/bindings/java/build.xml
index c00cfc75..dda536c3 100644
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -505,6 +505,7 @@
        <include name="bindings/java/**/*.java"/>
        <include name="bindings/java/**/*.java.in"/>
        <include name="bindings/java/**/*.c"/>
+       <include name="bindings/java/**/*.cpp"/>
        <include name="bindings/java/**/*.h"/>
        <include name="bindings/java/**/*.pl"/>
        <include name="bindings/java/**/build.xml"/>

From 8a4c9f6eb01ae4df35fdc41d1549d8572b4da9c3 Mon Sep 17 00:00:00 2001
From: Trevor Pounds <trevor.pounds@gmail.com>
Date: Wed, 29 Sep 2010 14:22:02 -0500
Subject: [PATCH 3/3] (SIGAR-227) fix to prevent missing file(s) from aborting
 add operation prematurely

---
 .../java/src/org/hyperic/sigar/FileWatcher.java | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/bindings/java/src/org/hyperic/sigar/FileWatcher.java b/bindings/java/src/org/hyperic/sigar/FileWatcher.java
index b1a9130d..69712819 100644
--- a/bindings/java/src/org/hyperic/sigar/FileWatcher.java
+++ b/bindings/java/src/org/hyperic/sigar/FileWatcher.java
@@ -23,6 +23,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.log4j.Logger;
+
 public abstract class FileWatcher {
 
     private Sigar sigar;
@@ -31,6 +33,9 @@ public abstract class FileWatcher {
     private Set files =
         Collections.synchronizedSet(new HashSet());
 
+    private static final Logger log =
+        SigarLog.getLogger(FileWatcher.class.getName());
+
     public abstract void onChange(FileInfo info);
 
     public void onNotFound(FileInfo info) {
@@ -66,14 +71,22 @@ public abstract class FileWatcher {
     public void add(File[] files)
         throws SigarException {
         for (int i=0; i<files.length; i++) {
-            add(files[i]);
+            try {
+                add(files[i]);
+            } catch (SigarFileNotFoundException e) {
+               log.error("Cannot add file: " + files[i].getAbsolutePath(), e);
+            }
         }
     }
 
     public void add(String[] files)
         throws SigarException {
         for (int i=0; i<files.length; i++) {
-            add(files[i]);
+            try {
+               add(files[i]);
+            } catch (SigarFileNotFoundException e) {
+               log.error("Cannot add file: " + files[i], e);
+            }
         }
     }