From b2c37ef77b079e3bdb0c905ad08b8848cf32cba2 Mon Sep 17 00:00:00 2001
From: wentch <22250530@qq.com>
Date: Thu, 24 Dec 2015 11:54:52 +0800
Subject: [PATCH]

---
 .../src/org/redkale/convert/ObjectDecoder.java           | 9 ++++-----
 .../src/org/redkale/convert/ObjectEncoder.java           | 9 +++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/android-jdk6-redkale/src/org/redkale/convert/ObjectDecoder.java b/android-jdk6-redkale/src/org/redkale/convert/ObjectDecoder.java
index 76ac7b93d..850f92c51 100644
--- a/android-jdk6-redkale/src/org/redkale/convert/ObjectDecoder.java
+++ b/android-jdk6-redkale/src/org/redkale/convert/ObjectDecoder.java
@@ -5,7 +5,6 @@
  */
 package org.redkale.convert;
 
-import java.beans.*;
 import org.redkale.util.Creator;
 import java.lang.reflect.*;
 import java.util.Arrays;
@@ -68,7 +67,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
             this.creator = factory.loadCreator(clazz);
 
             final Set<DeMember> list = new HashSet();
-            final ConstructorProperties cps = ObjectEncoder.findConstructorProperties(this.creator);
+            final String[] cps = ObjectEncoder.findConstructorProperties(this.creator);
             try {
                 ConvertColumnEntry ref;
                 for (final Field field : clazz.getFields()) {
@@ -87,7 +86,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                     if (!method.getName().startsWith("set")) continue;
                     if (method.getParameterTypes().length != 1) continue;
                     if (method.getReturnType() != void.class) continue;
-                    if (reversible && (cps == null || !ObjectEncoder.contains(cps.value(), ObjectEncoder.readGetSetFieldName(method)))) {
+                    if (reversible && (cps == null || !ObjectEncoder.contains(cps, ObjectEncoder.readGetSetFieldName(method)))) {
                         boolean is = method.getParameterTypes()[0] == boolean.class || method.getParameterTypes()[0] == Boolean.class;
                         try {
                             clazz.getMethod(method.getName().replaceFirst("set", is ? "is" : "get"));
@@ -101,7 +100,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                     list.add(new DeMember(ObjectEncoder.createAttribute(factory, clazz, null, null, method), factory.loadDecoder(t)));
                 }
                 if (cps != null) { //可能存在某些构造函数中的字段名不存在setter方法
-                    for (final String constructorField : cps.value()) {
+                    for (final String constructorField : cps) {
                         boolean flag = false;
                         for (DeMember m : list) {
                             if (m.attribute.field().equals(constructorField)) {
@@ -134,7 +133,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                 Arrays.sort(this.members);
 
                 if (cps != null) {
-                    final String[] fields = cps.value();
+                    final String[] fields = cps;
                     final DeMember<R, T, ?>[] ms = new DeMember[fields.length];
                     for (int i = 0; i < fields.length; i++) {
                         for (DeMember m : this.members) {
diff --git a/android-jdk6-redkale/src/org/redkale/convert/ObjectEncoder.java b/android-jdk6-redkale/src/org/redkale/convert/ObjectEncoder.java
index 1ccc9fd05..079364c37 100644
--- a/android-jdk6-redkale/src/org/redkale/convert/ObjectEncoder.java
+++ b/android-jdk6-redkale/src/org/redkale/convert/ObjectEncoder.java
@@ -54,7 +54,7 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
             //if (!(type instanceof Class)) throw new ConvertException("[" + type + "] is no a class");
             final Class clazz = this.typeClass;
             final Set<EnMember> list = new HashSet();
-            final ConstructorProperties cps = ObjectEncoder.findConstructorProperties(factory.loadCreator(this.typeClass));
+            final String[] cps = ObjectEncoder.findConstructorProperties(factory.loadCreator(this.typeClass));
             try {
                 ConvertColumnEntry ref;
                 for (final Field field : clazz.getFields()) {
@@ -74,7 +74,7 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
                     if (!method.getName().startsWith("is") && !method.getName().startsWith("get")) continue;
                     if (method.getParameterTypes().length != 0) continue;
                     if (method.getReturnType() == void.class) continue;
-                    if (reversible && (cps == null || !contains(cps.value(), readGetSetFieldName(method)))) {
+                    if (reversible && (cps == null || !contains(cps, readGetSetFieldName(method)))) {
                         boolean is = method.getName().startsWith("is");
                         try {
                             clazz.getMethod(method.getName().replaceFirst(is ? "is" : "get", "set"), method.getReturnType());
@@ -240,9 +240,10 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
         return fname;
     }
 
-    static ConstructorProperties findConstructorProperties(Creator creator) {
+    static String[] findConstructorProperties(Creator creator) {
         try {
-            return creator.getClass().getConstructor().getAnnotation(ConstructorProperties.class);
+            ConstructorProperties cps = creator.getClass().getConstructor().getAnnotation(ConstructorProperties.class);
+            return cps == null ? null : cps.value();
         } catch (Exception e) {
             return null;
         }