[asterisk-commits] dlee: branch dlee/stasis-cache-split r393998 - in /team/dlee/stasis-cache-spl...

[SVN commits to the Asterisk project]

Author: dlee
Date: Wed Jul 10 12:59:30 2013
New Revision: 393998

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=393998
Log:
Compile on Linux

Modified:
    team/dlee/stasis-cache-split/main/stasis_cache.c
    team/dlee/stasis-cache-split/res/res_xmpp.c

Modified: team/dlee/stasis-cache-split/main/stasis_cache.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/main/stasis_cache.c?view=diff&rev=393998&r1=393997&r2=393998
==============================================================================
--- team/dlee/stasis-cache-split/main/stasis_cache.c (original)
+++ team/dlee/stasis-cache-split/main/stasis_cache.c Wed Jul 10 12:59:30 2013
@@ -437,6 +437,10 @@
 		}
 	}
 
+	if (stasis_subscription_final_message(sub, message)) {
+		ao2_cleanup(caching_topic);
+	}
+
 	id = cache->id_fn(message);
 	if (id == NULL) {
 		/* Object isn't cached; forward */
@@ -457,10 +461,6 @@
 		ao2_ref(update, +1);
 		return update;
 	}
-
-	if (stasis_subscription_final_message(sub, message)) {
-		ao2_cleanup(caching_topic);
-	}
 }
 
 static void caching_topic_exec(void *data, struct stasis_subscription *sub,

Modified: team/dlee/stasis-cache-split/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/res/res_xmpp.c?view=diff&rev=393998&r1=393997&r2=393998
==============================================================================
--- team/dlee/stasis-cache-split/res/res_xmpp.c (original)
+++ team/dlee/stasis-cache-split/res/res_xmpp.c Wed Jul 10 12:59:30 2013
@@ -1605,7 +1605,7 @@
 		return;
 	}
 
-	cached = stasis_cache_dump(ast_device_state_topic_cached(), NULL);
+	cached = stasis_cache_dump(ast_device_state_cache(), NULL);
 	ao2_callback(cached, OBJ_NODATA, cached_devstate_cb, client);
 
 	xmpp_pubsub_subscribe(client, "device_state");