bug fix.

yangtu222 · Oct 30, 2017 · cb54836 · cb54836
1 parent 30cb4b5
commit cb54836
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/com/tuyang/beanutils/internal/cache/BeanCopyCache.java b/src/main/java/com/tuyang/beanutils/internal/cache/BeanCopyCache.java
@@ -122,7 +122,7 @@ private static CopyFeature[] parseBeanCopyFeatures(Class<?> sourceClass, Class<?
 			if( optionClass.isAnnotationPresent(BeanCopySource.class) ) {
 				BeanCopySource source = optionClass.getAnnotation(BeanCopySource.class);
 				Class<?> sourceClassFromAnnotation = source.source();
-				if( sourceClassFromAnnotation.equals(sourceClass) ) {
+				if( sourceClassFromAnnotation.isAssignableFrom(sourceClass) ) {
 					return source.features();
 				} else {
 					//fix sourceClass is proxy class.
@@ -135,7 +135,7 @@ private static CopyFeature[] parseBeanCopyFeatures(Class<?> sourceClass, Class<?
 		if( targetClass.isAnnotationPresent(BeanCopySource.class) ) {
 			BeanCopySource source = targetClass.getAnnotation(BeanCopySource.class);
 			Class<?> sourceClassFromAnnotation = source.source();
-			if( sourceClassFromAnnotation.equals(sourceClass) ) {
+			if( sourceClassFromAnnotation.isAssignableFrom(sourceClass) ) {
 				return source.features();
 			}
 		}
@@ -152,7 +152,7 @@ public static List<BeanCopyPropertyItem> buildBeanCopyPropertyItem(Class<?> sour
 			if( optionClass.isAnnotationPresent(BeanCopySource.class) ) {
 				BeanCopySource source = optionClass.getAnnotation(BeanCopySource.class);
 				Class<?> sourceClassFromAnnotation = source.source();
-				if( sourceClassFromAnnotation.equals(sourceClass) ) {
+				if( sourceClassFromAnnotation.isAssignableFrom(sourceClass) ) {
 					beanAnnotationSource = sourceClassFromAnnotation;
 				} else {
 					//fix sourceClass is proxy class.
@@ -165,7 +165,7 @@ public static List<BeanCopyPropertyItem> buildBeanCopyPropertyItem(Class<?> sour
 		if( beanAnnotationSource == null && targetClass.isAnnotationPresent(BeanCopySource.class) ) {
 			BeanCopySource source = targetClass.getAnnotation(BeanCopySource.class);
 			Class<?> sourceClassFromAnnotation = source.source();
-			if( sourceClassFromAnnotation.equals(sourceClass) ) {
+			if( sourceClassFromAnnotation.isAssignableFrom(sourceClass) ) {
 				beanAnnotationSource = sourceClassFromAnnotation;
 			}
 		}

diff --git a/src/main/java/com/tuyang/beanutils/internal/dump/BeanCopyDump.java b/src/main/java/com/tuyang/beanutils/internal/dump/BeanCopyDump.java
@@ -60,6 +60,9 @@ public static void dumpPropertyMapping(Class<?> sourceClass, Class<?> targetClas
 		dumpPropertyMappingInternal(sourceClass, targetClass, optionClass);
 
 		localDumpLevel.set(--dumpLevel);
+		if(dumpLevel == -1 && localDumpStack.get().size() > 0 ) {
+			logger.info("=============================================================================================");
+		}
 	}
 
 	public static void dumpPropertyMappingInternal(Class<?> sourceClass, Class<?> targetClass , Class<?> optionClass) {