[Archive-access-cvs] SF.net SVN: archive-access:[3594] trunk/archive-access/projects/ archive-commons/src/main/java/org/archive

[<vin...@us...>]

Revision: 3594
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3594&view=rev
Author:   vinaygoel
Date:     2012-01-12 04:57:09 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
BUGFIX: Added NullPointerException handling in the GoogleURLCanonicalizer and RealCDXExtractorOuput classes

Modified Paths:
--------------
    trunk/archive-access/projects/archive-commons/src/main/java/org/archive/extract/RealCDXExtractorOutput.java
    trunk/archive-access/projects/archive-commons/src/main/java/org/archive/url/GoogleURLCanonicalizer.java

Modified: trunk/archive-access/projects/archive-commons/src/main/java/org/archive/extract/RealCDXExtractorOutput.java
===================================================================
--- trunk/archive-access/projects/archive-commons/src/main/java/org/archive/extract/RealCDXExtractorOutput.java	2012-01-08 22:48:33 UTC (rev 3593)
+++ trunk/archive-access/projects/archive-commons/src/main/java/org/archive/extract/RealCDXExtractorOutput.java	2012-01-12 04:57:09 UTC (rev 3594)
@@ -311,8 +311,11 @@
 			URL cUrl = new URL(context);
 			URL resolved = new URL(cUrl,spec);
 			return resolved.toURI().toASCIIString();
+			
 		} catch (URISyntaxException e) {			
 		} catch (MalformedURLException e) {
+		} catch (NullPointerException e) {
+			
 		}
 		return spec;
 	}

Modified: trunk/archive-access/projects/archive-commons/src/main/java/org/archive/url/GoogleURLCanonicalizer.java
===================================================================
--- trunk/archive-access/projects/archive-commons/src/main/java/org/archive/url/GoogleURLCanonicalizer.java	2012-01-08 22:48:33 UTC (rev 3593)
+++ trunk/archive-access/projects/archive-commons/src/main/java/org/archive/url/GoogleURLCanonicalizer.java	2012-01-12 04:57:09 UTC (rev 3594)
@@ -147,7 +147,13 @@
 					}
 					int[] ip = new int[]{0,0,0,0};
 					for(int i=0; i < parts; i++) {
-						int octet = Integer.parseInt(m2.group(i+1).substring((i==0)?0:1));
+						
+						String m2Group = m2.group(i+1);
+						if(m2Group == null)
+							return null;
+						//int octet = Integer.parseInt(m2.group(i+1).substring((i==0)?0:1));
+						int octet = Integer.parseInt(m2Group.substring((i==0)?0:1));
+						
 						if((octet < 0) || (octet > 255)) {
 							return null;
 //							throw new URIException("Bad Host("+host+")");

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