svn commit: r634886 - in /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets: SyndicatorConfig.java http/DefaultCrossServletState.java

[lryan]

Author: lryan
Date: Fri Mar  7 17:36:46 2008
New Revision: 634886

URL: http://svn.apache.org/viewvc?rev=634886&view=rev
Log:
Include syndicator contents in cache-busting hash

Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SyndicatorConfig.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultCrossServletState.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SyndicatorConfig.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SyndicatorConfig.java?rev=634886&r1=634885&r2=634886&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SyndicatorConfig.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SyndicatorConfig.java
 Fri Mar  7 17:36:46 2008
@@ -103,6 +103,9 @@
     if (syndicatorData == null) {
       return null;
     }
+    if (parameter == null) {
+      return syndicatorData;
+    }
     return syndicatorData.optJSONObject(parameter);
   }
 

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultCrossServletState.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultCrossServletState.java?rev=634886&r1=634885&r2=634886&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultCrossServletState.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultCrossServletState.java
 Fri Mar  7 17:36:46 2008
@@ -197,6 +197,13 @@
           jsBuf.append(library.getContent());
         }
       }
+
+      // Include the syndicator in the hash
+      for (String syndicator : syndicatorConfig.getSyndicators()) {
+        jsBuf.append(syndicatorConfig.getJsonObject(syndicator,  null)
+            .toString());
+      }
+
       MessageDigest md;
       try {
         md = MessageDigest.getInstance("MD5");