--- old/com/oracle/jfr/gc/TestEvacuationInfoEvent.java	2013-05-02 15:03:57.000000000 +0200
+++ new/com/oracle/jfr/gc/TestEvacuationInfoEvent.java	2013-05-02 15:03:57.000000000 +0200
@@ -41,10 +41,10 @@
             Asserts.assertFalse(all.isEmpty(), String.format("No events of type '%s' found", EVENT_INFO_PATH));
 
             // Save gcIds for all EvacuationFailedEvents. These will be used to verify the EvacuationInfo event.
-            Set<Long> failedEvacuationGcIds = new HashSet<Long>();
+            Set<Integer> failedEvacuationGcIds = new HashSet<Integer>();
             for (FLREvent event : all) {
                 if (EVENT_FAILED_PATH.equals(event.getPath())) {
-                    failedEvacuationGcIds.add((Long)event.getValue("gcId"));
+                    failedEvacuationGcIds.add((Integer)event.getValue("gcId"));
                 }
             }
 
@@ -76,7 +76,7 @@
                         assertGreaterOrEqualThan(g1HeapRegionSize * setRegions, setUsedAfter, "G1HeapRegionSize * setRegions >= setUsedAfter");
                         assertGreaterOrEqualThan(g1HeapRegionSize * setRegions, setUsedBefore, "G1HeapRegionSize * setRegions >= setUsedBefore");
                         assertGreaterOrEqualThan(g1HeapRegionSize, allocRegionsUsedBefore, "G1HeapRegionSize >= allocRegionsUsedBefore");
-                        if (failedEvacuationGcIds.contains((Long)event.getValue("gcId"))) {
+                        if (failedEvacuationGcIds.contains((Integer)event.getValue("gcId"))) {
                             assertGreaterThan(setUsedAfter, 0L, "EvacuationFailure -> setUsedAfter > 0");
                             assertGreaterThan(setRegions, regionsFreed, "EvacuationFailure -> setRegions > regionsFreed");
                         } else {
@@ -109,9 +109,11 @@
         Random r = new Random(0);
         final int arraySize = 6000;
         dummyList = new ArrayList<DummyObject>(arraySize);
-        for (int c=0; c<arraySize; c++) {
+
+        for (int c = 0; c < arraySize; c++) {
             dummyList.add(null);
         }
+
         long bytesToAllocate = 256 * 1024 * 1024;
         int currPos = 0;
         while (bytesToAllocate > 0) {
@@ -130,7 +132,7 @@
                 dummyList = null;
                 System.gc();
                 dummyList = new ArrayList<DummyObject>(arraySize);
-                for (int c=0; c<arraySize; c++) {
+                for (int c = 0; c < arraySize; c++) {
                     dummyList.add(null);
                 }
             }