svn commit: r1705081 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

[markt]

Author: markt
Date: Thu Sep 24 15:35:57 2015
New Revision: 1705081

URL: http://svn.apache.org/viewvc?rev=1705081&view=rev
Log:
closed is used now rather than setting socket to 0.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1705081&r1=1705080&r2=1705081&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu Sep 24 
15:35:57 2015
@@ -2695,11 +2695,11 @@ public class AprEndpoint extends Abstrac
 
         @Override
         protected void populateRemoteAddr() {
-            long socket = getSocket().longValue();
-            if (socket == 0) {
+            if (closed) {
                 return;
             }
             try {
+                long socket = getSocket().longValue();
                 long sa = Address.get(Socket.APR_REMOTE, socket);
                 remoteAddr = Address.getip(sa);
             } catch (Exception e) {
@@ -2710,11 +2710,11 @@ public class AprEndpoint extends Abstrac
 
         @Override
         protected void populateRemoteHost() {
-            long socket = getSocket().longValue();
-            if (socket == 0) {
+            if (closed) {
                 return;
             }
             try {
+                long socket = getSocket().longValue();
                 long sa = Address.get(Socket.APR_REMOTE, socket);
                 remoteHost = Address.getnameinfo(sa, 0);
                 if (remoteAddr == null) {
@@ -2728,11 +2728,11 @@ public class AprEndpoint extends Abstrac
 
         @Override
         protected void populateRemotePort() {
-            long socket = getSocket().longValue();
-            if (socket == 0) {
+            if (closed) {
                 return;
             }
             try {
+                long socket = getSocket().longValue();
                 long sa = Address.get(Socket.APR_REMOTE, socket);
                 Sockaddr addr = Address.getInfo(sa);
                 remotePort = addr.port;
@@ -2744,11 +2744,11 @@ public class AprEndpoint extends Abstrac
 
         @Override
         protected void populateLocalName() {
-            long socket = getSocket().longValue();
-            if (socket == 0) {
+            if (closed) {
                 return;
             }
             try {
+                long socket = getSocket().longValue();
                 long sa = Address.get(Socket.APR_LOCAL, socket);
                 localName =Address.getnameinfo(sa, 0);
             } catch (Exception e) {
@@ -2759,11 +2759,11 @@ public class AprEndpoint extends Abstrac
 
         @Override
         protected void populateLocalAddr() {
-            long socket = getSocket().longValue();
-            if (socket == 0) {
+            if (closed) {
                 return;
             }
             try {
+                long socket = getSocket().longValue();
                 long sa = Address.get(Socket.APR_LOCAL, socket);
                 localAddr = Address.getip(sa);
             } catch (Exception e) {
@@ -2774,11 +2774,11 @@ public class AprEndpoint extends Abstrac
 
         @Override
         protected void populateLocalPort() {
-            long socket = getSocket().longValue();
-            if (socket == 0) {
+            if (closed) {
                 return;
             }
             try {
+                long socket = getSocket().longValue();
                 long sa = Address.get(Socket.APR_LOCAL, socket);
                 Sockaddr addr = Address.getInfo(sa);
                 localPort = addr.port;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org