diff --git a/src/main/java/org/redkale/convert/protobuf/ProtobufWriter.java b/src/main/java/org/redkale/convert/protobuf/ProtobufWriter.java index f67f46f52..43329c312 100644 --- a/src/main/java/org/redkale/convert/protobuf/ProtobufWriter.java +++ b/src/main/java/org/redkale/convert/protobuf/ProtobufWriter.java @@ -20,7 +20,7 @@ import org.redkale.util.*; */ public class ProtobufWriter extends Writer implements ByteTuple { - private static final int defaultSize = Integer.getInteger("convert.protobuf.writer.buffer.defsize", Integer.getInteger("convert.writer.buffer.defsize", 1024)); + private static final int defaultSize = Integer.getInteger("redkale.convert.protobuf.writer.buffer.defsize", Integer.getInteger("redkale.convert.writer.buffer.defsize", 1024)); private byte[] content; diff --git a/src/main/java/org/redkale/source/EntityCache.java b/src/main/java/org/redkale/source/EntityCache.java index 24aa33028..b475ace8c 100644 --- a/src/main/java/org/redkale/source/EntityCache.java +++ b/src/main/java/org/redkale/source/EntityCache.java @@ -255,9 +255,15 @@ public final class EntityCache { } } T[] result = arrayer.apply(pks.length); - for (int i = 0; i < result.length; i++) { - T rs = map.get(pks[i]); - result[i] = rs == null ? null : (needCopy ? newCopier.apply(this.creator.create(), rs) : rs); + if (needCopy) { + for (int i = 0; i < result.length; i++) { + T rs = map.get(pks[i]); + result[i] = rs == null ? null : newCopier.apply(this.creator.create(), rs); + } + } else { + for (int i = 0; i < result.length; i++) { + result[i] = map.get(pks[i]); + } } return result; } @@ -271,7 +277,7 @@ public final class EntityCache { return null; } if (selects == null) { - return (needCopy ? newCopier.apply(this.creator.create(), rs) : rs); + return needCopy ? newCopier.apply(this.creator.create(), rs) : rs; } T t = this.creator.create(); for (Attribute attr : this.info.attributes) {