移除日志

src/main/java/org/redkale/net/client/ClientCodec.java

@@ -128,14 +128,16 @@ public abstract class ClientCodec<R extends ClientRequest, P> implements Complet
                             Traces.currentTraceid(request.traceid);
                             respFuture.completeExceptionally(exc);
                         });
-                    } else if (workThread.inIO()) {
-                        Traces.currentTraceid(request.traceid);
-                        respFuture.completeExceptionally(exc);
                     } else if (workThread.getState() == Thread.State.RUNNABLE) {
-                        workThread.execute(() -> {
+                        if (workThread.inIO()) {
                             Traces.currentTraceid(request.traceid);
                             respFuture.completeExceptionally(exc);
-                        });
+                        } else {
+                            workThread.execute(() -> {
+                                Traces.currentTraceid(request.traceid);
+                                respFuture.completeExceptionally(exc);
+                            });
+                        }
                     } else {
                         workThread.runWork(() -> {
                             Traces.currentTraceid(request.traceid);
@@ -149,14 +151,16 @@ public abstract class ClientCodec<R extends ClientRequest, P> implements Complet
                             Traces.currentTraceid(request.traceid);
                             respFuture.complete(rs);
                         });
-                    } else if (workThread.inIO()) {
-                        Traces.currentTraceid(request.traceid);
-                        respFuture.complete(rs);
                     } else if (workThread.getState() == Thread.State.RUNNABLE) {
-                        workThread.execute(() -> {
+                        if (workThread.inIO()) {
                             Traces.currentTraceid(request.traceid);
                             respFuture.complete(rs);
-                        });
+                        } else {
+                            workThread.execute(() -> {
+                                Traces.currentTraceid(request.traceid);
+                                respFuture.complete(rs);
+                            });
+                        }
                     } else {
                         workThread.runWork(() -> {
                             Traces.currentTraceid(request.traceid);

src/main/java/org/redkale/util/Bean.java

@@ -11,6 +11,7 @@ import java.lang.annotation.*;
 
 /**
  * 标记参数bean
+ * @see org.redkale.annotation.Bean
  *
  * @since 2.5.0
  */

src/main/java/org/redkale/util/Utility.java

@@ -19,7 +19,6 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.*;
-import java.util.logging.Logger;
 import java.util.stream.Stream;
 import java.util.zip.GZIPInputStream;
 import javax.crypto.*;
@@ -282,33 +281,27 @@ public final class Utility {
         }
         return lambdaFieldNameCache.computeIfAbsent(func.getClass(), clazz -> {
             try {
-                if (nativeImageEnv) {
+                MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(func.getClass(), MethodHandles.lookup());
-                    return readLambdaFieldNameFromBytes(func);
+                MethodHandle mh = lookup.findVirtual(func.getClass(), "writeReplace", MethodType.methodType(Object.class));
-                } else {
+                String methodName = ((java.lang.invoke.SerializedLambda) mh.invoke(func)).getImplMethodName();
-                    MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(func.getClass(), MethodHandles.lookup());
+                return readFieldName(methodName);
-                    MethodHandle mh = lookup.findVirtual(func.getClass(), "writeReplace", MethodType.methodType(Object.class));
-                    String methodName = ((java.lang.invoke.SerializedLambda) mh.invoke(func)).getImplMethodName();
-                    return readFieldName(methodName);
-                }
             } catch (Throwable e) {
-                if (!nativeImageEnv) {
+                return readLambdaFieldNameFromBytes(func);
-                    return readLambdaFieldNameFromBytes(func);
-                }
-                throw e instanceof RedkaleException ? (RedkaleException) e : new RedkaleException(e);
             }
         });
     }
 
     private static String readLambdaFieldNameFromBytes(Serializable func) {
         try {
-            Logger logger = Logger.getLogger(Utility.class.getSimpleName());
+            ObjectWriteStream out = new ObjectWriteStream(new ByteArrayOutputStream());
-            ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-            ObjectWriteStream out = new ObjectWriteStream(bytes);
-           logger.info("enableReplaceObject-setting: " + out.enableReplaceObject(true));
             out.writeObject(func);
             out.close();
-           logger.info("out-content: " + binToHexString(bytes.toByteArray()));
+            String methodName = out.methodNameReference.get();
-            return readFieldName(out.methodNameReference.get());
+            if (methodName != null) {
+                return readFieldName(methodName);
+            } else {
+                throw new RedkaleException("cannot found method-name from lambda " + func);
+            }
         } catch (IOException e) {
             throw new RedkaleException(e);
         }
@@ -342,8 +335,6 @@ public final class Utility {
 
         @Override
         protected Object replaceObject​(Object obj) throws IOException {
-            Logger logger = Logger.getLogger(Utility.class.getSimpleName());
-            logger.info("obj-class: " + obj.getClass() + ", content: " + obj); 
             if (obj instanceof java.lang.invoke.SerializedLambda) {
                 methodNameReference.set(((java.lang.invoke.SerializedLambda) obj).getImplMethodName());
             }