[Archive-access-cvs] SF.net SVN: archive-access:[3161] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrl.java

[<bra...@us...>]

Revision: 3161
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3161&view=rev
Author:   bradtofel
Date:     2010-06-24 20:25:21 +0000 (Thu, 24 Jun 2010)

Log Message:
-----------
BUGFIX:(unreported) was not correctly handling empty/null datespec

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrl.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrl.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrl.java	2010-06-24 20:24:09 UTC (rev 3160)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrl.java	2010-06-24 20:25:21 UTC (rev 3161)
@@ -69,9 +69,15 @@
 	}
 
 	public String toString(String datespec, String url) {
+		int dateLen = 0;
+		if(datespec != null) {
+			dateLen = datespec.length();
+		}
 		StringBuilder sb = 
-			new StringBuilder(url.length() + datespec.length()+10);
-		sb.append(datespec);
+			new StringBuilder(url.length() + dateLen +10);
+		if(dateLen > 0) {
+			sb.append(datespec);
+		}
 		if(wbRequest.isCSSContext()) {
 			sb.append(ArchivalUrlRequestParser.CSS_CONTEXT);
 			sb.append(ArchivalUrlRequestParser.FLAG_DELIM);
@@ -88,7 +94,9 @@
 			sb.append(ArchivalUrlRequestParser.IDENTITY_CONTEXT);
 			sb.append(ArchivalUrlRequestParser.FLAG_DELIM);
 		}
-		sb.append("/");
+		if(dateLen > 0) {
+			sb.append("/");
+		}
 		sb.append(UrlOperations.stripDefaultPortFromUrl(url));
 		return sb.toString();
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.