Coerce if a coerce property is set and the instance property exists.

kriszyp · Nov 11, 2010 · f9ed902 · f9ed902
1 parent f664d58
commit f9ed902
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/json-schema.js b/lib/json-schema.js
@@ -183,7 +183,7 @@ var validate = exports._validate = function(/*Any*/instance,/*Object*/schema,/*B
                     if(value === undefined && propDef["default"]){
                         value = instance[i] = propDef["default"];
                     }
-                    if(exports.coerce){
+                    if(propDef.coerce && exports.coerce && i in instance){
                     	value = instance[i] = exports.coerce(value, propDef);
                     }
 					checkProp(value,propDef,path,i);
@@ -201,7 +201,7 @@ var validate = exports._validate = function(/*Any*/instance,/*Object*/schema,/*B
 			}
 			value = instance[i];
 			if(additionalProp && (!(objTypeDef && typeof objTypeDef == 'object') || !(i in objTypeDef))){
-                if(exports.coerce){
+                if(additionalProp.coerce && exports.coerce){
                 	value = instance[i] = exports.coerce(value, additionalProp);
                 }
 				checkProp(value,additionalProp,path,i);