JORTE: don't use finalizers in Java classes

[orte.git] / orte / java / src / org / ocera / orte / DomainMgr.java

diff --git a/orte/java/src/org/ocera/orte/DomainMgr.java b/orte/java/src/org/ocera/orte/DomainMgr.java
index bf4394c78cb249db09565a9d429fb32b6bf7e660..0919db80e09b1267ab5f0c570e8aaf8b7d3dddc8 100644 (file)
--- a/orte/java/src/org/ocera/orte/DomainMgr.java
+++ b/orte/java/src/org/ocera/orte/DomainMgr.java
@@ -55,22 +55,26 @@ public class DomainMgr extends Domain
                         DomainEvents events,
                         boolean suspend)
     {
+     super();   // set Default Domain Properties
+     if(props == null) {
+         this.props = DomainProp.defaultPropsCreate();
+     }
+     else {
+         this.props = props;
+     }
+     // init Domain Events
+     if(events == null) {
+         this.events.init();
+     }
+     else {
+         this.events = events;
+     }
           handle = jORTEDomainMgrCreate(domain,
                                         props.handle,
                                             events==null ? 0 : events.getHandle(),
                                                                 suspend);
     }
 
-
-    /**
-        * destructor
-        *
-        */
-        protected void finalize()
-        {
-           destroy();
-        }
-
         /*
      public void create()
      {}
@@ -83,7 +87,7 @@ public class DomainMgr extends Domain
          public
          boolean destroy()
          {
-           if(jORTEDomainMgrDestroy(this.handle)) return true;
+           if(jORTEDomainMgrDestroy(this.handle) && this.props.destroy()) return true;
            System.out.println(":j!: ORTEDomainMgrDestroy() fault..");
            return false;
          }