Author: cutting
Date: Wed Nov 28 22:38:28 2012
New Revision: 1414974
URL: http://svn.apache.org/viewvc?rev=1414974&view=rev
Log:
AVRO-1210. Java: Fix mistakes in AvroMultipleOutputs error messages.
Contributed by Dave Beech.
Modified:
avro/trunk/CHANGES.txt
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/AvroMultipleOutputs.java
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapreduce/AvroMultipleOutputs.java
Modified: avro/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1414974&r1=1414973&r2=1414974&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Wed Nov 28 22:38:28 2012
@@ -36,6 +36,9 @@ Trunk (not yet released)
AVRO-1207. Java: Add tests for Maven plugins. (Sharmarke Aden via cutting)
+ AVRO-1210. Java: Fix mistakes in AvroMultipleOutputs error messages.
+ (Dave Beech via cutting)
+
BUG FIXES
AVRO-1171. Java: Don't call configure() twice on mappers & reducers.
Modified:
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/AvroMultipleOutputs.java
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/AvroMultipleOutputs.java?rev=1414974&r1=1414973&r2=1414974&view=diff
==============================================================================
---
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/AvroMultipleOutputs.java
(original)
+++
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/AvroMultipleOutputs.java
Wed Nov 28 22:38:28 2012
@@ -178,7 +178,7 @@ public class AvroMultipleOutputs {
private static void checkTokenName(String namedOutput) {
if (namedOutput == null || namedOutput.length() == 0) {
throw new IllegalArgumentException(
- "Name cannot be NULL or emtpy");
+ "Name cannot be NULL or empty");
}
for (char ch : namedOutput.toCharArray()) {
if ((ch >= 'A') && (ch <= 'Z')) {
@@ -191,7 +191,7 @@ public class AvroMultipleOutputs {
continue;
}
throw new IllegalArgumentException(
- "Name cannot be have a '" + ch + "' char");
+ "Name cannot have a '" + ch + "' char");
}
}
Modified:
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapreduce/AvroMultipleOutputs.java
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapreduce/AvroMultipleOutputs.java?rev=1414974&r1=1414973&r2=1414974&view=diff
==============================================================================
---
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapreduce/AvroMultipleOutputs.java
(original)
+++
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapreduce/AvroMultipleOutputs.java
Wed Nov 28 22:38:28 2012
@@ -162,7 +162,7 @@ public class AvroMultipleOutputs{
private static void checkTokenName(String namedOutput) {
if (namedOutput == null || namedOutput.length() == 0) {
throw new IllegalArgumentException(
- "Name cannot be NULL or emtpy");
+ "Name cannot be NULL or empty");
}
for (char ch : namedOutput.toCharArray()) {
if ((ch >= 'A') && (ch <= 'Z')) {
@@ -175,7 +175,7 @@ public class AvroMultipleOutputs{
continue;
}
throw new IllegalArgumentException(
- "Name cannot be have a '" + ch + "' char");
+ "Name cannot have a '" + ch + "' char");
}
}