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/03 08:24:15 UTC

svn commit: r632966 - /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SyndicatorConfig.java

Author: lindner
Date: Sun Mar  2 23:24:14 2008
New Revision: 632966

URL: http://svn.apache.org/viewvc?rev=632966&view=rev
Log:
Apply same windows fix for SHINDIG-91 here as well, parse all combos of
CR, CRLF, LF

Modified:
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SyndicatorConfig.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=632966&r1=632965&r2=632966&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 Sun Mar  2 23:24:14 2008
@@ -253,7 +253,7 @@
         path = path.substring(6);
         logger.info("Loading resources from: " + path);
         if (path.endsWith(".txt")) {
-          loadResources(ResourceLoader.getContent(path).split("\n"));
+          loadResources(ResourceLoader.getContent(path).split("[\r\n]+"));
         } else {
           loadResources(new String[]{path});
         }