Author: blue
Date: Tue Mar 31 23:19:05 2015
New Revision: 1670516
URL: http://svn.apache.org/r1670516
Log:
AVRO-1652. Java: Do not warn or validate defaults if validation is off.
Contributed by Michael D'Angelo.
Modified:
avro/trunk/CHANGES.txt
avro/trunk/lang/java/avro/src/main/java/org/apache/avro/Schema.java
Modified: avro/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1670516&r1=1670515&r2=1670516&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Tue Mar 31 23:19:05 2015
@@ -128,6 +128,9 @@ Trunk (not yet released)
AVRO-1656. Fix 'How to Contribute' link. (Benjamin Clauss via blue)
+ AVRO-1652. Java: Do not warn or validate defaults if validation is off.
+ (Michael D'Angelo via blue)
+
Avro 1.7.7 (23 July 2014)
NEW FEATURES
Modified: avro/trunk/lang/java/avro/src/main/java/org/apache/avro/Schema.java
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/main/java/org/apache/avro/Schema.java?rev=1670516&r1=1670515&r2=1670516&view=diff
==============================================================================
--- avro/trunk/lang/java/avro/src/main/java/org/apache/avro/Schema.java
(original)
+++ avro/trunk/lang/java/avro/src/main/java/org/apache/avro/Schema.java Tue Mar
31 23:19:05 2015
@@ -1131,13 +1131,11 @@ public abstract class Schema extends Jso
private static JsonNode validateDefault(String fieldName, Schema schema,
JsonNode defaultValue) {
- if ((defaultValue != null)
+ if (VALIDATE_DEFAULTS.get() && (defaultValue != null)
&& !isValidDefault(schema, defaultValue)) { // invalid default
String message = "Invalid default for field "+fieldName
+": "+defaultValue+" not a "+schema;
- if (VALIDATE_DEFAULTS.get())
- throw new AvroTypeException(message); // throw exception
- System.err.println("[WARNING] Avro: "+message); // or log warning
+ throw new AvroTypeException(message); // throw exception
}
return defaultValue;
}
