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/19 13:53:29 UTC

svn commit: r718946 - in /lucene/solr/trunk: CHANGES.txt src/java/org/apache/solr/schema/IndexSchema.java

Author: shalin
Date: Wed Nov 19 04:53:29 2008
New Revision: 718946

URL: http://svn.apache.org/viewvc?rev=718946&view=rev
Log:
SOLR-872 -- Better error message for incorrect copyField destination

Modified:
    lucene/solr/trunk/CHANGES.txt
    lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java

Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=718946&r1=718945&r2=718946&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Wed Nov 19 04:53:29 2008
@@ -123,6 +123,8 @@
 
 10. SOLR-869: Fix file descriptor leak in SolrResourceLoader#getLines (Mark Miller, shalin)
 
+11. SOLR-872: Better error message for incorrect copyField destination (Noble Paul via shalin)
+
 
 Other Changes
 ----------------------

Modified: lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java?rev=718946&r1=718945&r2=718946&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java Wed Nov 19 04:53:29 2008
@@ -661,7 +661,10 @@
     boolean destIsPattern   = isWildCard(dest);
 
     log.debug("copyField source='"+source+"' dest='"+dest+"'");
-    SchemaField d = getField(dest);
+    SchemaField d = getFieldOrNull(dest);
+    if(d == null){
+      throw new SolrException( SolrException.ErrorCode.SERVER_ERROR, "copyField destination :'"+dest+"' does not exist" );
+    }
 
     if(sourceIsPattern) {
       if( destIsPattern ) {