From 73650e1f2be427a355e313179560831d242500dd Mon Sep 17 00:00:00 2001
From: Wyatt Fang <wyatt.fang@augmentum.com>
Date: Fri, 24 Apr 2015 11:14:49 +0800
Subject: [PATCH] remove the double isStruct/isStructPtr check

---
 validation/validation.go | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/validation/validation.go b/validation/validation.go
index d91679f7..21226e02 100644
--- a/validation/validation.go
+++ b/validation/validation.go
@@ -341,6 +341,7 @@ func (v *Validation) Valid(obj interface{}) (b bool, err error) {
 // Anonymous fields will be ignored
 func (v *Validation) RecursiveValid(objc interface{}) (bool, error) {
 	//Step 1: validate obj itself firstly
+	// fails if objc is not struct
 	pass, err := v.Valid(objc)
 	if err != nil || false == pass {
 		return pass, err // Stop recursive validation
@@ -348,23 +349,22 @@ func (v *Validation) RecursiveValid(objc interface{}) (bool, error) {
 		// Step 2: Validate struct's struct fields
 		objT := reflect.TypeOf(objc)
 		objV := reflect.ValueOf(objc)
-		if isStruct(objT) || isStructPtr(objT) {
 
-			if isStructPtr(objT) {
-				objT = objT.Elem()
-				objV = objV.Elem()
-			}
+		if isStructPtr(objT) {
+			objT = objT.Elem()
+			objV = objV.Elem()
+		}
 
-			for i := 0; i < objT.NumField(); i++ {
+		for i := 0; i < objT.NumField(); i++ {
 
-				t := objT.Field(i).Type
+			t := objT.Field(i).Type
 
-				if isStruct(t) || isStructPtr(t) {
-					// Step 3: do the recursive validation
-					// Only valid the Public field recursively
-					if objV.Field(i).CanInterface() {
-						pass, err = v.RecursiveValid(objV.Field(i).Interface())
-					}
+			// Recursive applies to struct or pointer to structs fields
+			if isStruct(t) || isStructPtr(t) {
+				// Step 3: do the recursive validation
+				// Only valid the Public field recursively
+				if objV.Field(i).CanInterface() {
+					pass, err = v.RecursiveValid(objV.Field(i).Interface())
 				}
 			}
 		}