--- old/com/oracle/jfr/gc/TestHeapSummaryEventConcurrentCMS.java	2013-05-02 15:03:58.000000000 +0200
+++ new/com/oracle/jfr/gc/TestHeapSummaryEventConcurrentCMS.java	2013-05-02 15:03:58.000000000 +0200
@@ -52,16 +52,16 @@
             assertTrue(cmsEvents.size() > 0,
                        "Expected at least one " + gcPath + " event for collector " + cmsGCName);
 
-            List<Long> cmsGCIds = mapGCEventsToGCIds(cmsEvents);
+            List<Integer> cmsGCIds = mapGCEventsToGCIds(cmsEvents);
             List<FLREvent> cmsHeapSummaryEvents =
                 filterHeapSummaryEventsOnGCIds(heapSummaryEvents, cmsGCIds);
 
-            HashMap<Long, FLREvent> gcIdToHeapSummaryBefore =
+            HashMap<Integer, FLREvent> gcIdToHeapSummaryBefore =
                 mapGCIdToHeapSummary("Before GC", cmsHeapSummaryEvents);
-            HashMap<Long, FLREvent> gcIdToHeapSummaryAfter =
+            HashMap<Integer, FLREvent> gcIdToHeapSummaryAfter =
                 mapGCIdToHeapSummary("After GC", cmsHeapSummaryEvents);
 
-            for (Long gcId : cmsGCIds) {
+            for (Integer gcId : cmsGCIds) {
                 assertTrue(gcIdToHeapSummaryBefore.get(gcId) != null,
                            "Expected a " + heapSummaryPath + " event before " +
                            gcPath + " event with id " + gcId);
@@ -120,19 +120,19 @@
         return result;
     }
 
-    private static List<Long> mapGCEventsToGCIds(List<FLREvent> events) throws Exception {
-        List<Long> result = new ArrayList<Long>();
+    private static List<Integer> mapGCEventsToGCIds(List<FLREvent> events) throws Exception {
+        List<Integer> result = new ArrayList<Integer>();
         for (FLREvent e : events) {
-            result.add((Long) e.getValue("gcId"));
+            result.add((Integer) e.getValue("gcId"));
         }
         return result;
     }
 
-    private static List<FLREvent> filterHeapSummaryEventsOnGCIds(List<FLREvent> events, List<Long> gcIds)
+    private static List<FLREvent> filterHeapSummaryEventsOnGCIds(List<FLREvent> events, List<Integer> gcIds)
         throws Exception {
         List<FLREvent> result = new ArrayList<FLREvent>();
         for (FLREvent e : events) {
-            Long gcId = (Long) e.getValue("gcId");
+            Integer gcId = (Integer) e.getValue("gcId");
             if (gcIds.contains(gcId)) {
                 result.add(e);
             }
@@ -140,8 +140,8 @@
         return result;
     }
 
-    private static HashMap<Long, FLREvent> mapGCIdToHeapSummary(String when, List<FLREvent> events) throws Exception {
-        HashMap<Long, FLREvent> map = new HashMap<Long, FLREvent>();
+    private static HashMap<Integer, FLREvent> mapGCIdToHeapSummary(String when, List<FLREvent> events) throws Exception {
+        HashMap<Integer, FLREvent> map = new HashMap<Integer, FLREvent>();
         for (FLREvent e : events) {
             if (getWhen(e).equals(when)) {
                 map.put(getGCId(e), e);
@@ -162,7 +162,8 @@
         return ret;
     }
 
-    private static Long getGCId(FLREvent e) throws Exception {
-        return (Long) e.getValue("gcId");
+    private static Integer getGCId(FLREvent e) throws Exception {
+        return (Integer) e.getValue("gcId");
     }
 }
+