svn commit: r683080 - /incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/JsonDbOpensocialService.java

[doll]

Author: doll
Date: Tue Aug  5 18:38:24 2008
New Revision: 683080

URL: http://svn.apache.org/viewvc?rev=683080&view=rev
Log:
Not all activities in the canonical db have appids, so if an appId filter comes 
in it will be ignored for activities with no appId.  


Modified:
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/JsonDbOpensocialService.java

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/JsonDbOpensocialService.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/JsonDbOpensocialService.java?rev=683080&r1=683079&r2=683080&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/JsonDbOpensocialService.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/JsonDbOpensocialService.java
 Tue Aug  5 18:38:24 2008
@@ -123,9 +123,9 @@
           JSONArray activities = 
db.getJSONObject(ACTIVITIES_TABLE).getJSONArray(id);
           for (int i = 0; i < activities.length(); i++) {
             JSONObject activity = activities.getJSONObject(i);
-            if (appId != null && 
activity.get(Activity.Field.APP_ID.toString()).equals(appId)) {
+            if (appId == null || 
!activity.has(Activity.Field.APP_ID.toString())) {
               result.add(convertToActivity(activity, fields));
-            } else if (appId == null) {
+            } else if 
(activity.get(Activity.Field.APP_ID.toString()).equals(appId)) {
               result.add(convertToActivity(activity, fields));
             }
           }