svn commit: r1447171 - in /tomcat/trunk/java/org/apache/tomcat/jni/socket: AprSocket.java AprSocketContext.java

[markt]

Author: markt
Date: Mon Feb 18 09:36:08 2013
New Revision: 1447171

URL: http://svn.apache.org/r1447171
Log:
Fix checkstyle warnings
(sorry new laptop - need to configure it properly)

Modified:
    tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
    tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java

Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java?rev=1447171&r1=1447170&r2=1447171&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java Mon Feb 18 
09:36:08 2013
@@ -61,28 +61,28 @@ public class AprSocket implements Runnab
 
     private static final byte[][] NO_CERTS = new byte[0][];
 
-    final static int CONNECTING = 0x1;
-    final static int CONNECTED = 0x2;
+    static final int CONNECTING = 0x1;
+    static final int CONNECTED = 0x2;
 
     // Current ( real ) poll status
-    final static int POLLIN_ACTIVE = 0x4;
-    final static int POLLOUT_ACTIVE = 0x8;
+    static final int POLLIN_ACTIVE = 0x4;
+    static final int POLLOUT_ACTIVE = 0x8;
 
-    final static int POLL = 0x10;
+    static final int POLL = 0x10;
 
-    final static int SSL_ATTACHED = 0x40;
+    static final int SSL_ATTACHED = 0x40;
 
     // Requested poll status. Set by read/write when needed.
     // Cleared when polled
-    final static int POLLIN = 0x80;
-    final static int POLLOUT = 0x100;
+    static final int POLLIN = 0x80;
+    static final int POLLOUT = 0x100;
 
-    final static int ACCEPTED = 0x200;
-    final static int ERROR = 0x400;
-    final static int CLOSED = 0x800;
+    static final int ACCEPTED = 0x200;
+    static final int ERROR = 0x400;
+    static final int CLOSED = 0x800;
 
-    final static int READING = 0x1000;
-    final static int WRITING = 0x2000;
+    static final int READING = 0x1000;
+    static final int WRITING = 0x2000;
 
     // Not null
     private final AprSocketContext context;

Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java?rev=1447171&r1=1447170&r2=1447171&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java Mon 
Feb 18 09:36:08 2013
@@ -91,7 +91,7 @@ public class AprSocketContext {
 
     private final AprSocket END = new AprSocket(this);
 
-    private final static AtomicInteger contextNumber = new AtomicInteger();
+    private static final AtomicInteger contextNumber = new AtomicInteger();
     private int contextId;
 
     private final AtomicInteger threadNumber = new AtomicInteger();
@@ -123,7 +123,7 @@ public class AprSocketContext {
     private boolean nonBlockingAccept = false;
 
     private final BlockingQueue<AprSocket> acceptedQueue =
-               new LinkedBlockingQueue<>();
+            new LinkedBlockingQueue<>();
 
     /**
      * Root APR memory pool.
@@ -744,7 +744,7 @@ public class AprSocketContext {
 
                 int family = Socket.APR_INET;
                 inetAddress =
-                               Address.info(null, family, port, 0, 
serverSockPool);
+                        Address.info(null, family, port, 0, serverSockPool);
 
                 // Create the APR server socket
                 serverSock = Socket.create(family,



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