You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2016/02/19 08:53:49 UTC
[2/4] lucene-solr git commit: SOLR-8677: Fix broken build
SOLR-8677: Fix broken build
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/55162f22
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/55162f22
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/55162f22
Branch: refs/heads/branch_5x
Commit: 55162f2255a1f707603cc81134996cfb2a5968ec
Parents: 96c01a2
Author: anshum <an...@apache.org>
Authored: Thu Feb 18 16:03:58 2016 -0800
Committer: anshum <an...@apache.org>
Committed: Thu Feb 18 23:53:07 2016 -0800
----------------------------------------------------------------------
.../org/apache/solr/client/solrj/request/CoreAdminRequest.java | 4 ++--
.../org/apache/solr/client/solrj/request/TestCoreAdmin.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/55162f22/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
index 2a2d4ae..c1f986e 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
@@ -111,7 +111,7 @@ public class CoreAdminRequest extends SolrRequest<CoreAdminResponse> {
@Override
public void setCoreName(String coreName) {
if (!SolrIdentifierValidator.validateCoreName(coreName)) {
- throw new IllegalArgumentException("Invalid collection: " + coreName
+ throw new IllegalArgumentException("Invalid core: " + coreName
+ ". Core names must consist entirely of periods, underscores, and alphanumerics");
}
this.core = coreName;
@@ -560,7 +560,7 @@ public class CoreAdminRequest extends SolrRequest<CoreAdminResponse> {
public static CoreAdminResponse renameCore(String coreName, String newName, SolrClient client )
throws SolrServerException, IOException {
if (!SolrIdentifierValidator.validateCoreName(newName)) {
- throw new IllegalArgumentException("Invalid collection: " + newName
+ throw new IllegalArgumentException("Invalid core: " + newName
+ ". Core names must consist entirely of periods, underscores, and alphanumerics");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/55162f22/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
index 8275ff1..143d2c3 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
@@ -171,7 +171,7 @@ public class TestCoreAdmin extends AbstractEmbeddedSolrServerTestCase {
final String exceptionMessage = e.getMessage();
assertTrue(exceptionMessage.contains("Invalid core"));
assertTrue(exceptionMessage.contains("invalid$core@name"));
- assertTrue(exceptionMessage.contains("must consist entirely of periods, underscores and alphanumerics"));
+ assertTrue(exceptionMessage.contains("must consist entirely of periods, underscores, and alphanumerics"));
}
}
@@ -182,9 +182,9 @@ public class TestCoreAdmin extends AbstractEmbeddedSolrServerTestCase {
fail();
} catch (IllegalArgumentException e) {
final String exceptionMessage = e.getMessage();
- assertTrue(exceptionMessage.contains("Invalid core"));
+ assertTrue(e.getMessage(), exceptionMessage.contains("Invalid core"));
assertTrue(exceptionMessage.contains("invalid$core@name"));
- assertTrue(exceptionMessage.contains("must consist entirely of periods, underscores and alphanumerics"));
+ assertTrue(exceptionMessage.contains("must consist entirely of periods, underscores, and alphanumerics"));
}
}