Fix unit test bugs on Mac OS X 64-bit.

This commit fixes bugs 959 (local work size set incorrectly),
960 (concurrencyTest() throws ConcurrentModificationException)
963 (programBinariesTest() causes SIGSEGV) and 964 (builderTest()
cases CL_INVALID_VALUE). After this commit, all JOCL tests should
pass on 64-bit Mac OS X.

1 files changed, 5 insertions, 8 deletions

diff --git a/src/com/jogamp/opencl/CLContext.java b/src/com/jogamp/opencl/CLContext.java
index c3bd0e3f..163375eb 100644
--- a/src/com/jogamp/opencl/CLContext.java
+++ b/src/com/jogamp/opencl/CLContext.java
@@ -287,6 +287,7 @@ public class CLContext extends CLObjectResource {
      */
     public CLProgram createProgram(Map<CLDevice, byte[]> binaries) {
         CLProgram program = CLProgram.create(this, binaries);
+        program.setNoSource();
         programs.add(program);
         return program;
     }
@@ -486,11 +487,8 @@ public class CLContext extends CLObjectResource {
     
     private void release(Collection<? extends CLResource> resources) {
         // resources remove themselves when released, see above
-        if(!resources.isEmpty()) {
-            CLResource[] array = resources.toArray(new CLResource[resources.size()]);
-            for (CLResource resource : array) {
-                resource.release();
-            }
+        while(!resources.isEmpty()) {
+            resources.iterator().next().release();
         }
     }
 
@@ -509,9 +507,8 @@ public class CLContext extends CLObjectResource {
 
             synchronized(queuesMap) {
                 final Collection<List<CLCommandQueue>> queuesList =  queuesMap.values();
-                for( Iterator<List<CLCommandQueue>> queuesI = queuesList.iterator(); queuesI.hasNext(); ) {
-                    release(queuesI.next());
-                }
+                while(!queuesList.isEmpty())
+                    release(queuesList.iterator().next());
             }
 
         } finally {