From da89d13c77eb7ddc1c88b9b8aed6125def17888a Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@hyperic.com>
Date: Mon, 5 Mar 2007 21:48:58 +0000
Subject: [PATCH] handle duplicate counter names

---
 .../java/src/org/hyperic/sigar/win32/Pdh.java | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/bindings/java/src/org/hyperic/sigar/win32/Pdh.java b/bindings/java/src/org/hyperic/sigar/win32/Pdh.java
index 4d823944..fefd238e 100644
--- a/bindings/java/src/org/hyperic/sigar/win32/Pdh.java
+++ b/bindings/java/src/org/hyperic/sigar/win32/Pdh.java
@@ -28,6 +28,8 @@ import org.hyperic.sigar.SigarLoader;
 
 public class Pdh extends Win32 {
 
+    public static final long SUCCESS = 0;
+
     public static final String PERFLIB_KEY =
         "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib";
 
@@ -210,7 +212,27 @@ public class Pdh extends Win32 {
         }
 
         String counter = tok.nextToken();
-        trans.append(DELIM).append(getCounterName(counter));
+        trans.append(DELIM);
+
+        int[] cix = (int[])counters.get(counter);
+        if (cix != null) {
+            if (cix.length == 1) {
+                counter = getCounterName(cix[0]);
+            }
+            else {
+                //handle duplicate counter names
+                for (int i=0; i<cix.length; i++) {
+                    String name =
+                        getCounterName(cix[i]);
+                    if (validate(trans + name) == SUCCESS) {
+                        counter = name;
+                        break;
+                    }
+                }
+            }
+        }
+
+        trans.append(counter);
 
         return trans.toString();
     }