Revision: 16443
Author: brainslog
Date: Fri Jan 14 17:37:12 2011
Log: Diameter Resource Adaptors proper startActivity*() methods

Update Issue 2275
Committed patch.


http://code.google.com/p/mobicents/source/detail?r=16443

Modified:
/trunk/servers/jain-slee/resources/diameter-base/ra/src/main/java/org/mobicents/slee/resource/diameter/base/DiameterBaseResourceAdaptor.java /trunk/servers/jain-slee/resources/diameter-cca/ra/src/main/java/org/mobicents/slee/resource/diameter/cca/DiameterCCAResourceAdaptor.java /trunk/servers/jain-slee/resources/diameter-cx-dx/ra/src/main/java/org/mobicents/slee/resource/diameter/cxdx/DiameterCxDxResourceAdaptor.java /trunk/servers/jain-slee/resources/diameter-gx/ra/src/main/java/org/mobicents/slee/resource/diameter/gx/DiameterGxResourceAdaptor.java /trunk/servers/jain-slee/resources/diameter-rf/ra/src/main/java/org/mobicents/slee/resource/diameter/rf/DiameterRfResourceAdaptor.java /trunk/servers/jain-slee/resources/diameter-ro/ra/src/main/java/org/mobicents/slee/resource/diameter/ro/DiameterRoResourceAdaptor.java /trunk/servers/jain-slee/resources/diameter-sh-client/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/client/DiameterShClientResourceAdaptor.java /trunk/servers/jain-slee/resources/diameter-sh-server/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/server/DiameterShServerResourceAdaptor.java

=======================================
--- /trunk/servers/jain-slee/resources/diameter-base/ra/src/main/java/org/mobicents/slee/resource/diameter/base/DiameterBaseResourceAdaptor.java Fri Jan 14 14:28:45 2011 +++ /trunk/servers/jain-slee/resources/diameter-base/ra/src/main/java/org/mobicents/slee/resource/diameter/base/DiameterBaseResourceAdaptor.java Fri Jan 14 17:37:12 2011
@@ -718,11 +718,17 @@
    *
    * @param ac the activity that has been created
    */
-  private void addActivity(DiameterActivity ac) {
+  private void addActivity(DiameterActivity ac, boolean suspended) {
     try {
       // Inform SLEE that Activity Started
       DiameterActivityImpl activity = (DiameterActivityImpl) ac;
- sleeEndpoint.startActivity(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+
+      if (suspended) {
+ sleeEndpoint.startActivitySuspended(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+      }
+      else {
+ sleeEndpoint.startActivity(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+      }

       // Put it into our activites map
       activities.put(activity.getActivityHandle(), activity);
@@ -963,7 +969,7 @@

     //session.addStateChangeNotification(activity);
     activity.setSessionListener(this);
-    addActivity(activity);
+    addActivity(activity, false);
   }

   /*
@@ -977,7 +983,7 @@

     //session.addStateChangeNotification(activity);
     activity.setSessionListener(this);
-    addActivity(activity);
+    addActivity(activity, false);
   }

   /*
@@ -991,7 +997,7 @@

     //session.addStateChangeNotification(activity);
     activity.setSessionListener(this);
-    addActivity(activity);
+    addActivity(activity, true);
   }

   /*
@@ -1005,7 +1011,7 @@

     activity.setSessionListener(this);
     // session.addStateChangeNotification(activity);
-    addActivity(activity);
+    addActivity(activity, true);
   }

   /*
@@ -1020,7 +1026,7 @@
     // TODO: Do we need to manage session?
     //session.addStateChangeNotification(activity);
     activity.setSessionListener(this);
-    addActivity(activity);
+    addActivity(activity, true);
   }

   //  /*
=======================================
--- /trunk/servers/jain-slee/resources/diameter-cca/ra/src/main/java/org/mobicents/slee/resource/diameter/cca/DiameterCCAResourceAdaptor.java Fri Jan 14 12:45:06 2011 +++ /trunk/servers/jain-slee/resources/diameter-cca/ra/src/main/java/org/mobicents/slee/resource/diameter/cca/DiameterCCAResourceAdaptor.java Fri Jan 14 17:37:12 2011
@@ -666,11 +666,16 @@
    *
    * @param ac the activity that has been created
    */
-  private void activityCreated(DiameterActivity ac) {
+  private void activityCreated(DiameterActivity ac, boolean suspended) {
     try {
       // Inform SLEE that Activity Started
       DiameterActivityImpl activity = (DiameterActivityImpl) ac;
- sleeEndpoint.startActivity(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+      if (suspended) {
+ sleeEndpoint.startActivitySuspended(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+      }
+      else {
+ sleeEndpoint.startActivity(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+      }

       // Put it into our activites map
       activities.put(activity.getActivityHandle(), activity);
@@ -875,7 +880,7 @@

     //session.addStateChangeNotification(activity);
     activity.setSessionListener(this);
-    activityCreated(activity);
+    activityCreated(activity, true);
   }

   private void sessionCreated(ServerCCASession ccServerSession) {
@@ -893,7 +898,7 @@
CreditControlServerSessionImpl activity = new CreditControlServerSessionImpl(ccaMsgFactory,this.ccaAvpFactory,ccServerSession,null,null);

     activity.setSessionListener(this);
-    activityCreated(activity);
+    activityCreated(activity, false);
   }

// Credit Control Provider Implementation ------------------------------------
=======================================
--- /trunk/servers/jain-slee/resources/diameter-cx-dx/ra/src/main/java/org/mobicents/slee/resource/diameter/cxdx/DiameterCxDxResourceAdaptor.java Fri Jan 14 14:28:45 2011 +++ /trunk/servers/jain-slee/resources/diameter-cx-dx/ra/src/main/java/org/mobicents/slee/resource/diameter/cxdx/DiameterCxDxResourceAdaptor.java Fri Jan 14 17:37:12 2011
@@ -652,11 +652,17 @@
    *
    * @param ac the activity that has been created
    */
-  private void addActivity(DiameterActivity ac) {
+  private void addActivity(DiameterActivity ac, boolean suspended) {
     try {
       // Inform SLEE that Activity Started
       DiameterActivityImpl activity = (DiameterActivityImpl) ac;
- sleeEndpoint.startActivity(activity.getActivityHandle(), activity, DEFAULT_ACTIVITY_FLAGS);
+
+      if (suspended) {
+ sleeEndpoint.startActivitySuspended(activity.getActivityHandle(), activity, DEFAULT_ACTIVITY_FLAGS);
+      }
+      else {
+ sleeEndpoint.startActivity(activity.getActivityHandle(), activity, DEFAULT_ACTIVITY_FLAGS);
+      }

       // Set the listener
       activity.setSessionListener(this);
@@ -884,7 +890,7 @@
     // TODO: Do we need to manage session?
     //session.addStateChangeNotification(activity);
     activity.setSessionListener(this);
-    addActivity(activity);
+    addActivity(activity, true);
   }

   /*
@@ -973,7 +979,7 @@
       }

CxDxServerSessionImpl activity = new CxDxServerSessionImpl(ra.cxdxMessageFactory, ra.cxdxAvpFactory, session, (EventListener<Request, Answer>) session, (DiameterIdentity)null, (DiameterIdentity)null,stack);
-      addActivity(activity);
+      addActivity(activity, false);

       if(request != null) {
         if(request.getCommandCode() == LocationInfoRequest.COMMAND_CODE) {
@@ -1005,7 +1011,7 @@
       try {
ServerCxDxSession session = ((ISessionFactory) stack.getSessionFactory()).getNewAppSession(null, ApplicationId.createByAuthAppId(10415L, 16777216L), ServerCxDxSession.class); CxDxServerSessionImpl activity = new CxDxServerSessionImpl(ra.cxdxMessageFactory, ra.cxdxAvpFactory, session, (EventListener<Request, Answer>) session, destinationHost, destinationRealm, stack);
-        addActivity(activity);
+        addActivity(activity, false);
         return activity;
       }
       catch (Exception e) {
@@ -1022,7 +1028,7 @@
ClientCxDxSession session = ((ISessionFactory) stack.getSessionFactory()).getNewAppSession(null, ApplicationId.createByAuthAppId(10415L, 16777216L), ClientCxDxSession.class);

CxDxClientSessionImpl activity = new CxDxClientSessionImpl(new CxDxMessageFactoryImpl(session.getSessions().get(0),stack), ra.cxdxAvpFactory, session, (EventListener<Request, Answer>) session, destinationHost, destinationRealm, ra.sleeEndpoint);
-        addActivity(activity);
+        addActivity(activity, true);
         return activity;
       }
       catch (Exception e) {
@@ -1036,7 +1042,7 @@
ClientCxDxSession session = ((ISessionFactory) stack.getSessionFactory()).getNewAppSession(sessionId, ApplicationId.createByAuthAppId(10415L, 16777216L), ClientCxDxSession.class);

CxDxClientSessionImpl activity = new CxDxClientSessionImpl(new CxDxMessageFactoryImpl(session.getSessions().get(0),stack), ra.cxdxAvpFactory, session, (EventListener<Request, Answer>) session, null, null, ra.sleeEndpoint);
-        addActivity(activity);
+        addActivity(activity, true);

         if(request != null) {
           if(request.getCommandCode() == PushProfileRequest.COMMAND_CODE) {
=======================================
--- /trunk/servers/jain-slee/resources/diameter-gx/ra/src/main/java/org/mobicents/slee/resource/diameter/gx/DiameterGxResourceAdaptor.java Fri Jan 14 14:28:45 2011 +++ /trunk/servers/jain-slee/resources/diameter-gx/ra/src/main/java/org/mobicents/slee/resource/diameter/gx/DiameterGxResourceAdaptor.java Fri Jan 14 17:37:12 2011
@@ -676,11 +676,17 @@
      *
      * @param ac the activity that has been created
      */
-    private void addActivity(final DiameterActivity ac) {
+ private void addActivity(final DiameterActivity ac, boolean suspended) {
         try {
             // Inform SLEE that Activity Started
final DiameterActivityImpl activity = (DiameterActivityImpl) ac; - sleeEndpoint.startActivity(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+
+            if (suspended) {
+ sleeEndpoint.startActivitySuspended(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+            }
+            else {
+ sleeEndpoint.startActivity(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+            }

             // Set the listener
             activity.setSessionListener(this);
@@ -842,7 +848,7 @@
//FIXME: baranowb: add basic session mgmt for base? or do we relly on responses?
         //session.addStateChangeNotification(activity);
         activity.setSessionListener(this);
-        addActivity(activity);
+        addActivity(activity, true);
     }

     public void sessionCreated(final ServerGxSession gxServerSession) {
@@ -860,7 +866,7 @@
//FIXME: baranowb: add basic session mgmt for base? or do we relly on responses?
         //session.addStateChangeNotification(activity);
         activity.setSessionListener(this);
-        addActivity(activity);
+        addActivity(activity, false);
     }

     public boolean sessionExists(final String sessionId) {
=======================================
--- /trunk/servers/jain-slee/resources/diameter-rf/ra/src/main/java/org/mobicents/slee/resource/diameter/rf/DiameterRfResourceAdaptor.java Fri Jan 14 14:28:45 2011 +++ /trunk/servers/jain-slee/resources/diameter-rf/ra/src/main/java/org/mobicents/slee/resource/diameter/rf/DiameterRfResourceAdaptor.java Fri Jan 14 17:37:12 2011
@@ -602,11 +602,17 @@
    *
    * @param ac the activity that has been created
    */
-  private void addActivity(DiameterActivity ac) {
+  private void addActivity(DiameterActivity ac, boolean suspended) {
     try {
       // Inform SLEE that Activity Started
       DiameterActivityImpl activity = (DiameterActivityImpl) ac;
- sleeEndpoint.startActivity(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+
+      if (suspended) {
+ sleeEndpoint.startActivitySuspended(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+      }
+      else {
+ sleeEndpoint.startActivity(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+      }

       // Set the listener
       activity.setSessionListener(this);
@@ -827,7 +833,7 @@

     activity.setSessionListener(this);
     session.addStateChangeNotification(activity);
-    addActivity(activity);
+    addActivity(activity, true);
   }

   /*
@@ -841,7 +847,7 @@

     session.addStateChangeNotification(activity);
     activity.setSessionListener(this);
-    addActivity(activity);
+    addActivity(activity, false);
   }

   /*
=======================================
--- /trunk/servers/jain-slee/resources/diameter-ro/ra/src/main/java/org/mobicents/slee/resource/diameter/ro/DiameterRoResourceAdaptor.java Fri Jan 14 14:28:45 2011 +++ /trunk/servers/jain-slee/resources/diameter-ro/ra/src/main/java/org/mobicents/slee/resource/diameter/ro/DiameterRoResourceAdaptor.java Fri Jan 14 17:37:12 2011
@@ -667,11 +667,17 @@
    *
    * @param ac the activity that has been created
    */
-  private void addActivity(DiameterActivity ac) {
+  private void addActivity(DiameterActivity ac, boolean suspended) {
     try {
       // Inform SLEE that Activity Started
       DiameterActivityImpl activity = (DiameterActivityImpl) ac;
- sleeEndpoint.startActivity(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+
+      if (suspended) {
+ sleeEndpoint.startActivitySuspended(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+      }
+      else {
+ sleeEndpoint.startActivity(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+      }

       // Set the listener
       activity.setSessionListener(this);
@@ -933,7 +939,7 @@
//FIXME: baranowb: add basic session mgmt for base? or do we relly on responses?
     //session.addStateChangeNotification(activity);
     activity.setSessionListener(this);
-    addActivity(activity);
+    addActivity(activity, true);
   }

   public void sessionCreated(ServerRoSession ccServerSession)
@@ -954,7 +960,7 @@
//FIXME: baranowb: add basic session mgmt for base? or do we relly on responses?
     //session.addStateChangeNotification(activity);
     activity.setSessionListener(this);
-    addActivity(activity);
+    addActivity(activity, false);
   }

   public boolean sessionExists(String sessionId) {
=======================================
--- /trunk/servers/jain-slee/resources/diameter-sh-client/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/client/DiameterShClientResourceAdaptor.java Fri Jan 14 14:28:45 2011 +++ /trunk/servers/jain-slee/resources/diameter-sh-client/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/client/DiameterShClientResourceAdaptor.java Fri Jan 14 17:37:12 2011
@@ -661,11 +661,17 @@
    *
    * @param ac the activity that has been created
    */
-  private void activityCreated(DiameterActivity ac) {
+  private void activityCreated(DiameterActivity ac, boolean suspended) {
     try {
       // Inform SLEE that Activity Started
       DiameterActivityImpl activity = (DiameterActivityImpl) ac;
- sleeEndpoint.startActivity(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+
+      if (suspended) {
+ sleeEndpoint.startActivitySuspended(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+      }
+      else {
+ sleeEndpoint.startActivity(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+      }

       // Put it into our activites map
       activities.put(activity.getActivityHandle(), activity);
@@ -1063,7 +1069,7 @@
ShClientSubscriptionActivityImpl activity = new ShClientSubscriptionActivityImpl(getSessionShMessageFactory(session), shAvpFactory, session, null, null);
       activity.fetchSessionData(pushNotificationRequest,true);
       activity.setSessionListener(ra);
-      activityCreated(activity);
+      activityCreated(activity, false);

       //FIXME: baranowb: this is akward, jdiam has weird api
       //This is trick to trigger fire and state machine
@@ -1091,7 +1097,7 @@
ShClientActivityImpl activity = new ShClientActivityImpl(getSessionShMessageFactory(session), shAvpFactory, session, null, null);

       activity.setSessionListener(ra);
-      activityCreated(activity);
+      activityCreated(activity, true);

       return activity;
     }
@@ -1192,7 +1198,7 @@

ShClientSubscriptionActivityImpl activity = new ShClientSubscriptionActivityImpl(getSessionShMessageFactory(session), shAvpFactory, session, null, null);
       activity.setSessionListener(ra);
-      activityCreated(activity);
+      activityCreated(activity, true);

       return activity;
     }
=======================================
--- /trunk/servers/jain-slee/resources/diameter-sh-server/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/server/DiameterShServerResourceAdaptor.java Fri Jan 14 12:45:06 2011 +++ /trunk/servers/jain-slee/resources/diameter-sh-server/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/server/DiameterShServerResourceAdaptor.java Fri Jan 14 17:37:12 2011
@@ -656,14 +656,14 @@
ShServerSubscriptionActivityImpl _activity = new ShServerSubscriptionActivityImpl(shServerMsgFactory, this.shAvpFactory, session, null, null);
       _activity.setSessionListener(this);
       activity = _activity;
+      activityCreated(activity, true);
     }
     else {
ShServerActivityImpl _activity = new ShServerActivityImpl(shServerMsgFactory, this.shAvpFactory, session, null, null);
       _activity.setSessionListener(this);
       activity = _activity;
-    }
-
-    activityCreated(activity);
+      activityCreated(activity, false);
+    }
   }

   /*
@@ -684,11 +684,17 @@
    *
    * @param ac the activity that has been created
    */
-  private void activityCreated(DiameterActivity ac) {
+  private void activityCreated(DiameterActivity ac, boolean suspended) {
     try {
       // Inform SLEE that Activity Started
       DiameterActivityImpl activity = (DiameterActivityImpl) ac;
- sleeEndpoint.startActivity(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+
+      if (suspended) {
+ sleeEndpoint.startActivitySuspended(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+      }
+      else {
+ sleeEndpoint.startActivity(activity.getActivityHandle(), activity, MARSHALABLE_ACTIVITY_FLAGS);
+      }

       // Put it into our activities map
       activities.put(activity.getActivityHandle(), activity);

Reply via email to