You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by li...@apache.org on 2008/03/19 01:22:15 UTC

svn commit: r638659 - in /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social: GadgetDataServlet.java samplecontainer/XmlStateFileFetcher.java

Author: lindner
Date: Tue Mar 18 17:22:14 2008
New Revision: 638659

URL: http://svn.apache.org/viewvc?rev=638659&view=rev
Log:
Apply java 1.5 compatibilty patch from Michael Papp for SHINDIG-139

Modified:
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java?rev=638659&r1=638658&r2=638659&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java Tue Mar 18 17:22:14 2008
@@ -98,7 +98,7 @@
 
   private List<ResponseItem> createResponse(String requestParam, String token)
       throws JSONException, GadgetException {
-    if (token == null || token.trim().isEmpty()) {
+    if (token == null || token.trim().length() == 0) {
       throw new GadgetException(GadgetException.Code.INVALID_GADGET_TOKEN);
     }
     GadgetToken securityToken = servletState.getGadgetSigner().createToken(token);

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java?rev=638659&r1=638658&r2=638659&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java Tue Mar 18 17:22:14 2008
@@ -240,7 +240,7 @@
     NodeList friendNodes = personNode.getChildNodes();
     for (int j = 0; j < friendNodes.getLength(); j++) {
       String friendId = friendNodes.item(j).getTextContent();
-      if (friendId != null && !friendId.trim().isEmpty()) {
+      if (friendId != null && friendId.trim().length() != 0) {
         friends.add(friendId.trim());
       }
     }