bloritsch 01/11/26 12:15:32
Modified: src/org/apache/cocoon Main.java
Log:
Fix CLI when string uri sampling returns '' urls
Revision Changes Path
1.31 +6 -3 xml-cocoon2/src/org/apache/cocoon/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Main.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Main.java 2001/11/26 19:55:53 1.30
+++ Main.java 2001/11/26 20:15:32 1.31
@@ -35,7 +35,7 @@
* Command line entry point.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.30 $ $Date: 2001/11/26 19:55:53 $
+ * @version CVS $Revision: 1.31 $ $Date: 2001/11/26 20:15:32 $
*/
public class Main {
@@ -506,7 +506,7 @@
}
String filename = (String)allTranslatedLinks.get(suri);
- if(filename == null || "".equals(filename)){
+ if(filename == null){
filename = mangle(suri);
final String type = getType(deparameterizedURI, parameters);
final String ext = NetUtils.getExtension(filename);
@@ -516,9 +516,12 @@
}
allTranslatedLinks.put(suri, filename);
}
-
// Store processed URI list to avoid eternal loop
allProcessedLinks.put(suri, filename);
+
+ if ("".equals(filename)) {
+ return new ArrayList();
+ }
// Process links
final ArrayList absoluteLinks = new ArrayList();
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
