]> rtime.felk.cvut.cz Git - orte.git/commitdiff
JORTE: simplify Manager destruction and remove unnecessary println()
authorMartin Vajnar <martin.vajnar@gmail.com>
Fri, 19 Jul 2013 09:29:33 +0000 (11:29 +0200)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Mon, 23 Sep 2013 09:06:26 +0000 (11:06 +0200)
orte/java/src/org/ocera/orte/DomainMgr.java
orte/java/src/org/ocera/orte/JOrte.java
orte/java/src/org/ocera/orte/Manager.java

index 0919db80e09b1267ab5f0c570e8aaf8b7d3dddc8..c9070e89d62dc795abc8bc7a4254b617f004168f 100644 (file)
@@ -62,13 +62,7 @@ public class DomainMgr extends Domain
      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(),
index c70a7a21fb0b1397b99baefc56f710e3f0daf97f..bfaf9cf3219dc2cac146f1281fcb89f06d479a70 100644 (file)
@@ -37,7 +37,6 @@ public class JOrte {
    void sleepMs(long msec)
    {
     jORTESleepMs(msec);
-    System.out.println(":j: sleep " + msec + "[milisec]  ..ZZzzzz..."); 
    }
 
    public static
index c36d0b5657f7fd90e2238bf26637c5e27473eee6..92874e7340d2c8f7dc21c8db8f5d3e030f1b4f82 100644 (file)
@@ -4,11 +4,10 @@ import org.ocera.orte.types.*;;
 
 public class Manager {
        
-       private DomainProp dprops;
        private DomainMgr dmgr;
        
        public Manager(String[] mgrs) {
-               dprops = DomainProp.defaultPropsCreate();
+               DomainProp dprops = DomainProp.defaultPropsCreate();
                dprops.setProps(mgrs);
                
                dmgr = new DomainMgr(ORTEConstant.ORTE_DEFAULT_DOMAIN,
@@ -16,4 +15,8 @@ public class Manager {
                                                         null,
                                                         false);
        }
+
+        public boolean destroy() {
+                return dmgr.destroy())
+        }
 }