Index: CHANGES.txt
===================================================================
--- CHANGES.txt	(revision 1682085)
+++ CHANGES.txt	(working copy)
@@ -2,6 +2,8 @@
   
 Nutch Current Development 1.11-SNAPSHOT
 
+* NUTCH-1995 Add support for wildcard to http.robot.rules.whitelist
+
 * NUTCH-2013 Fetcher: missing logs "fetching ..." on stdout (snagel)
 
 * NUTCH-2014 Fetcher hang-up on completion (snagel)
Index: src/java/org/apache/nutch/protocol/RobotRulesParser.java
===================================================================
--- src/java/org/apache/nutch/protocol/RobotRulesParser.java	(revision 1682085)
+++ src/java/org/apache/nutch/protocol/RobotRulesParser.java	(working copy)
@@ -129,19 +129,23 @@
     }
 
     String[] confWhiteList = conf.getStrings("http.robot.rules.whitelist");
-
-    for (int i = 0; i < confWhiteList.length; i++) {
-      if (confWhiteList[i].isEmpty()) {
-    	  LOG.info("Empty whitelisted URL skipped!");
-    	  continue;
+    if (confWhiteList == null) {
+      LOG.info("robots.txt whitelist not configured.");
+    }
+    else {
+      for (int i = 0; i < confWhiteList.length; i++) {
+        if (confWhiteList[i].isEmpty()) {
+      	  LOG.info("Empty whitelisted URL skipped!");
+      	  continue;
+        }
+        whiteList.add(confWhiteList[i]);
       }
-      whiteList.add(confWhiteList[i]);
+      
+      if (whiteList.size() > 0) {
+        matcher = new SuffixStringMatcher(whiteList);
+        LOG.info("Whitelisted hosts: " + whiteList);
+      }
     }
-    
-    if (whiteList.size() > 0) {
-      matcher = new SuffixStringMatcher(whiteList);
-      LOG.info("Whitelisted hosts: " + whiteList);
-    }
   }
 
   /**