]> rtime.felk.cvut.cz Git - orte.git/commitdiff
JORTE: don't force application domain destruction
authorMartin Vajnar <martin.vajnar@gmail.com>
Fri, 19 Jul 2013 09:25:15 +0000 (11:25 +0200)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Mon, 23 Sep 2013 09:06:26 +0000 (11:06 +0200)
This prevents appDomain being destroyed along with publisher or subscriber.

orte/java/src/org/ocera/orte/Publication.java
orte/java/src/org/ocera/orte/Subscription.java

index 5a84c188dab06a4a462e69bf1916223036bb5565..4eab46988e01cc9b2b751522bb356d54ad0e5079 100644 (file)
@@ -34,7 +34,6 @@ public class Publication {
   private org.ocera.orte.types.MessageData msgData;
 
   private boolean b;
-  private Domain appDomain;
 /*
   private int callbackEnvHandle = 0;
 */
@@ -64,7 +63,6 @@ public class Publication {
                       PublProp publProp,
                                          MessageData instance)
   {
-   this.appDomain = d;
        this.handle = jORTEPublicationCreate(d.handle,
                                             publProp.getTopic(),
                                             publProp.getTypeName(),
@@ -92,12 +90,6 @@ public class Publication {
            System.out.println(":j!: publication destroy fault!");
            return false;               
        }
-       // destroy application domain    
-    if(!appDomain.destroy()) 
-    {
-           System.out.println(":j!: publication destroy fault!");
-           return false;                       
-    }
     System.out.println(":j: publication destroy successfull..");
     return true;
   }
index 5331cf96c77b4c69b48fb165dbc1b27ebc2bf748..68af0f44cb323f160a06ea650fe5218e6af486ec 100644 (file)
@@ -33,8 +33,6 @@ public class Subscription {
    private long handle;
    private long callbackContextHandle = 0;
 
-   private Domain appDomain;
-
   /**
    * Get Subscription's handle.
    * @return Handle of the subscription.
@@ -54,8 +52,7 @@ public class Subscription {
                                                 MessageData message,
                                                 SubscriptionCallback subsCallback)
   {
-    this.appDomain = appDomain;
-       this.handle = jORTESubscriptionCreate(this.appDomain.handle,
+       this.handle = jORTESubscriptionCreate(appDomain.handle,
                                              subsProp.getMode(),
                                              subsProp.getType(),
                                              subsProp.getTopic(),
@@ -84,12 +81,6 @@ public class Subscription {
            System.out.println(":j!: subscription destroy fault!");
            return false;               
        }
-       // destroy application domain    
-    if(!appDomain.destroy()) 
-    {
-           System.out.println(":j!: subscription destroy fault!");
-           return false;                       
-    }
     System.out.println(":j: subscription destroy successfull..");
     return true;