fix memory leak bug in jmePhysicsSpace.

diff --git a/engine/src/bullet/com/jme3/bullet/PhysicsSpace.java b/engine/src/bullet/com/jme3/bullet/PhysicsSpace.java
index 86ecf18..a6cf633 100644 (file)
--- a/engine/src/bullet/com/jme3/bullet/PhysicsSpace.java
+++ b/engine/src/bullet/com/jme3/bullet/PhysicsSpace.java
@@ -151,7 +151,7 @@ public class PhysicsSpace {
         //TODO: boroadphase!
         physicsSpaceId = createPhysicsSpace(worldMin.x, worldMin.y, worldMin.z, worldMax.x, worldMax.y, worldMax.z, 3, false);
         pQueueTL.set(pQueue);
-        physicsSpaceTL.set(this);
+//        physicsSpaceTL.set(this);
 
 //        collisionConfiguration = new DefaultCollisionConfiguration();
 //        dispatcher = new CollisionDispatcher(collisionConfiguration);
@@ -437,8 +437,10 @@ public class PhysicsSpace {
             removeCollisionObject((PhysicsCollisionObject) obj);
         } else if (obj instanceof PhysicsJoint) {
             removeJoint((PhysicsJoint) obj);
+        } else if (obj == null) {
+            return;
         } else {
-            throw (new UnsupportedOperationException("Cannot remove this kind of object from the physics space."));
+            throw (new UnsupportedOperationException("Cannot remove this kind of object from the physics space."+obj));
         }
     }
 
@@ -920,17 +922,25 @@ public class PhysicsSpace {
 
     @Override
     protected void finalize() throws Throwable {
-        for(PhysicsJoint o : physicsJoints) {
-            remove(o);
-        }
-        physicsJoints.clear();
-        for(PhysicsCollisionObject o : physicsNodes.values()) {
-            remove(o);
+        for(;;) {
+            try {
+                while(physicsJoints.size() > 0) {
+                    remove(physicsJoints.get(0));
+                }
+                while(physicsNodes.size() > 0) {
+                    for(PhysicsRigidBody node : physicsNodes.values()) {
+                        remove(node);
+                        break;
+                    }
+                }
+                super.finalize();
+                Logger.getLogger(this.getClass().getName()).log(Level.FINE, "Finalizing PhysicsSpace {0}", Long.toHexString(physicsSpaceId));
+                finalizeNative(physicsSpaceId);
+                break;
+            } catch(Exception ex) {
+                Logger.getLogger(PhysicsSpace.class.getName()).log(Level.SEVERE, "finalize failed.", ex);
+            }
         }
-        physicsNodes.clear();
-        super.finalize();
-        Logger.getLogger(this.getClass().getName()).log(Level.FINE, "Finalizing PhysicsSpace {0}", Long.toHexString(physicsSpaceId));
-        finalizeNative(physicsSpaceId);
     }
 
     private native void finalizeNative(long objectId);

diff --git a/engine/src/bullet/native/jmePhysicsSpace.cpp b/engine/src/bullet/native/jmePhysicsSpace.cpp
index 9ae3021..13c5bbc 100644 (file)
--- a/engine/src/bullet/native/jmePhysicsSpace.cpp
+++ b/engine/src/bullet/native/jmePhysicsSpace.cpp
@@ -106,12 +106,12 @@ void jmePhysicsSpace::createPhysicsSpace(jfloat minX, jfloat minY, jfloat minZ,
     //    if(threading){
     //        cci.m_defaultMaxPersistentManifoldPoolSize = 32768;
     //    }
-    btCollisionConfiguration* collisionConfiguration = new btDefaultCollisionConfiguration(cci);
+    collisionConfiguration = new btDefaultCollisionConfiguration(cci);
 
     btVector3 min = btVector3(minX, minY, minZ);
     btVector3 max = btVector3(maxX, maxY, maxZ);
 
-    btBroadphaseInterface* broadphase;
+    // btBroadphaseInterface* broadphase;
 
     switch (broadphaseId) {
         case 0:
@@ -135,8 +135,8 @@ void jmePhysicsSpace::createPhysicsSpace(jfloat minX, jfloat minY, jfloat minZ,
             break;
     }
 
-    btCollisionDispatcher* dispatcher;
-    btConstraintSolver* solver;
+    // btCollisionDispatcher* dispatcher;
+    // btConstraintSolver* solver;
     // use the default collision dispatcher. For parallel processing you can use a diffent dispatcher (see Extras/BulletMultiThreaded)
     if (threading) {
         btThreadSupportInterface* dispatchThreads = createDispatchThreadSupport(4);
@@ -166,8 +166,8 @@ void jmePhysicsSpace::createPhysicsSpace(jfloat minX, jfloat minY, jfloat minZ,
         world->getSolverInfo().m_solverMode = SOLVER_SIMD + SOLVER_USE_WARMSTARTING; //+SOLVER_RANDMIZE_ORDER;
         world->getDispatchInfo().m_enableSPU = true;
     }
-
-    broadphase->getOverlappingPairCache()->setInternalGhostPairCallback(new btGhostPairCallback());
+    ghostPairCallback = new btGhostPairCallback();
+    broadphase->getOverlappingPairCache()->setInternalGhostPairCallback(ghostPairCallback);
 
     dynamicsWorld->setGravity(btVector3(0, -9.81f, 0));
 
@@ -267,6 +267,11 @@ jobject jmePhysicsSpace::getJavaPhysicsSpace() {
 }
 
 jmePhysicsSpace::~jmePhysicsSpace() {
+    delete dispatcher;
+    delete solver;
+    delete broadphase;
+    delete collisionConfiguration;
+    delete ghostPairCallback;
     delete(dynamicsWorld);
     getEnv()->DeleteWeakGlobalRef(this->javaPhysicsSpace);
 }

diff --git a/engine/src/bullet/native/jmePhysicsSpace.h b/engine/src/bullet/native/jmePhysicsSpace.h
index 24a6d70..9dcc206 100644 (file)
--- a/engine/src/bullet/native/jmePhysicsSpace.h
+++ b/engine/src/bullet/native/jmePhysicsSpace.h
@@ -57,6 +57,13 @@ private:
        JNIEnv* env;
        JavaVM* vm;
        btDynamicsWorld* dynamicsWorld;
+
+        btCollisionDispatcher* dispatcher;
+        btConstraintSolver* solver;
+        btBroadphaseInterface* broadphase;
+        btCollisionConfiguration* collisionConfiguration;
+        btOverlappingPairCallback *ghostPairCallback;
+
        jobject javaPhysicsSpace;
         btThreadSupportInterface* createSolverThreadSupport(int);
         btThreadSupportInterface* createDispatchThreadSupport(int);