You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by sh...@apache.org on 2008/11/10 11:01:28 UTC

svn commit: r712639 - in /lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport: DataImportHandlerException.java SolrWriter.java

Author: shalin
Date: Mon Nov 10 02:01:27 2008
New Revision: 712639

URL: http://svn.apache.org/viewvc?rev=712639&view=rev
Log:
Do not show "Processing Document # " in exception messages if exceptions comes before the import process.

Modified:
    lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandlerException.java
    lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java

Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandlerException.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandlerException.java?rev=712639&r1=712638&r2=712639&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandlerException.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandlerException.java Mon Nov 10 02:01:27 2008
@@ -41,12 +41,12 @@
   }
 
   public DataImportHandlerException(int err, String message) {
-    super(message + MSG + SolrWriter.getDocCount());
+    super(message + (SolrWriter.getDocCount() == null ? "" : MSG + SolrWriter.getDocCount()));
     errCode = err;
   }
 
   public DataImportHandlerException(int err, String message, Throwable cause) {
-    super(message + MSG + SolrWriter.getDocCount(), cause);
+    super(message + (SolrWriter.getDocCount() == null ? "" : MSG + SolrWriter.getDocCount()), cause);
     errCode = err;
   }
 

Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java?rev=712639&r1=712638&r2=712639&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java Mon Nov 10 02:01:27 2008
@@ -221,7 +221,7 @@
       return ""
               + (DocBuilder.INSTANCE.get().importStatistics.docCount.get() + 1);
     } else {
-      return "";
+      return null;
     }
   }