Minor cleanup of commented stuff

eclipse-vertx · Mar 6, 2021 · ce59552 · ce59552
1 parent 5179264
commit ce59552
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 24 deletions.
diff --git a/src/main/java/io/vertx/core/http/impl/HttpChannelConnector.java b/src/main/java/io/vertx/core/http/impl/HttpChannelConnector.java
@@ -11,7 +11,6 @@
 
 package io.vertx.core.http.impl;
 
-import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelPipeline;
@@ -20,7 +19,6 @@
 import io.netty.handler.logging.LoggingHandler;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.handler.timeout.IdleStateHandler;
-import io.netty.util.concurrent.GenericFutureListener;
 import io.vertx.core.Future;
 import io.vertx.core.Promise;
 import io.vertx.core.http.HttpClientOptions;

diff --git a/src/main/java/io/vertx/core/net/impl/NetClientImpl.java b/src/main/java/io/vertx/core/net/impl/NetClientImpl.java
@@ -183,10 +183,6 @@ private void checkClosed() {
     }
   }
 
-  private void applyConnectionOptions(boolean domainSocket, Bootstrap bootstrap) {
-    vertx.transport().configure(options, domainSocket, bootstrap);
-  }
-
   @Override
   public NetClient connect(SocketAddress remoteAddress, String serverName, Handler<AsyncResult<NetSocket>> connectHandler) {
     Objects.requireNonNull(connectHandler, "No null connectHandler accepted");
@@ -220,7 +216,7 @@ public void doConnect(SocketAddress remoteAddress, SocketAddress peerAddress, St
     Bootstrap bootstrap = new Bootstrap();
     bootstrap.group(context.nettyEventLoop());
 
-    applyConnectionOptions(remoteAddress.isDomainSocket(), bootstrap);
+    vertx.transport().configure(options, remoteAddress.isDomainSocket(), bootstrap);
 
     ChannelProvider channelProvider = new ChannelProvider(bootstrap, sslHelper, context)
       .proxyOptions(options.getProxyOptions());

diff --git a/src/main/java/io/vertx/core/net/impl/pool/SimpleConnectionPool.java b/src/main/java/io/vertx/core/net/impl/pool/SimpleConnectionPool.java
@@ -97,12 +97,7 @@ private void execute(Synchronization.Action<SimpleConnectionPool<C>> action) {
   }
 
   public int size() {
-//    lock.lock();
-//    try {
       return size;
-//    } finally {
-//      lock.unlock();
-//    }
   }
 
   public void connect(Slot<C> slot, Handler<AsyncResult<Lease<C>>> handler) {
@@ -396,21 +391,11 @@ private void recycle(LeaseImpl<C> lease) {
   }
 
   public int waiters() {
-    // lock.lock();
-    // try {
-      return waiters.size();
-    // } finally {
-    //   lock.unlock();
-    // }
+    return waiters.size();
   }
 
   public int weight() {
-    // lock.lock();
-    // try {
-      return weight;
-    // } finally {
-    //  lock.unlock();
-    // }
+    return weight;
   }
 
   private static class Close<C> implements Synchronization.Action<SimpleConnectionPool<C>> {