合并冲突

src/com/platform/utils/BeanCopy.java

@@ -1,6 +1,7 @@
 package com.platform.utils;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,7 +26,7 @@ public class BeanCopy {
 	 * @throws NoSuchFieldException
 	 * @throws SecurityException
 	 */
-	public static void copyBean(Object source, Object dst, String... params) throws Exception{
+	public static void copyBean(Object source, Object dst, String... params){
 		if (dst.getClass().getSuperclass() == source.getClass()) {
 			fatherCopyChild(source, dst, params);
 		}
@@ -45,14 +46,18 @@ public class BeanCopy {
 			if (sourceFieldName.contains(name)) {
 				field.setAccessible(true);
 				Object value;
-					Method m = source.getClass().getMethod("get"+upperHeadChar(name));
+					Method m;
-					value = m.invoke(source);
+					try {
-//				Field fie = source.getClass().getDeclaredField(name);
+						m = source.getClass().getMethod("get"+upperHeadChar(name));
-//				fie.setAccessible(true);
+						value = m.invoke(source);
-//				value = fie.get(source);
+		//				Field fie = source.getClass().getDeclaredField(name);
-				if (null != value) {
+		//				fie.setAccessible(true);
-					field.set(dst, value);
+		//				value = fie.get(source);
-				}
+						if (null != value) 
+							field.set(dst, value);
+					} catch (Exception e) {
+						log.error(e.getStackTrace());
+					}
 			}
 		}
 		
@@ -87,7 +92,7 @@ public class BeanCopy {
 		}
 	}
 	
-	private static void fatherCopyChild(Object father, Object dst, String... params) throws Exception{
+	private static void fatherCopyChild(Object father, Object dst, String... params){
 		List<String> filter = new ArrayList<String>();
 		filter.addAll(Arrays.asList(params));
 		if (dst.getClass().getSuperclass() == father.getClass()) {
@@ -101,9 +106,14 @@ public class BeanCopy {
 				}
 				f.setAccessible(true);
 				Class type = f.getType();
-				Method m = faClass.getMethod("get"+upperHeadChar(f.getName()));
+				Method m;
-				Object obj = m.invoke(father);
+				try {
-				f.set(dst, obj);
+					m = faClass.getMethod("get"+upperHeadChar(f.getName()));
+					Object obj = m.invoke(father);
+					f.set(dst, obj);
+				} catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+					log.error(e.getStackTrace());
+				}
 			}
 		}
 	}