Author: funkman
Date: Wed Nov  4 00:54:02 2009
New Revision: 832636

URL: http://svn.apache.org/viewvc?rev=832636&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=46947

Code cleanup patch that removes some obsolete null checks



Modified:
    tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
    tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
    tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java

Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=832636&r1=832635&r2=832636&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Wed Nov  
4 00:54:02 2009
@@ -430,10 +430,8 @@
             try {
                 jmxServerConnection = (MBeanServerConnection) pref;
             } catch (ClassCastException cce) {
-                if (project != null) {
-                    project.log("wrong object reference " + refId + " - "
+                project.log("wrong object reference " + refId + " - "
                             + pref.getClass());
-                }
                 return null;
             }
         }

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=832636&r1=832635&r2=832636&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java 
Wed Nov  4 00:54:02 2009
@@ -30,7 +30,7 @@
 /**
  *
  * @author Filip Hanik
- * @version $Revision:$ $Date:$
+ * @version $Revision$ $Date$
  */
 public class BioReceiver extends ReceiverBase implements Runnable, 
ChannelReceiver, ListenCallback {
 

Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=832636&r1=832635&r2=832636&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Wed 
Nov  4 00:54:02 2009
@@ -462,17 +462,13 @@
         
         getNext().invoke(request, response);
 
-        String remoteHost = EMPTY;
+        String remoteHost;
         if(resolveHosts)
             remoteHost = request.getRemoteHost();
         else
             remoteHost = request.getRemoteAddr();
-        String user = EMPTY;
-        if(request != null)
-            user = request.getRemoteUser();
-        String query="";
-        if(request != null)
-            query = request.getRequestURI();
+        String user = request.getRemoteUser();
+        String query=request.getRequestURI();
         
         long bytes = response.getContentCountLong() ;
         if(bytes < 0)
@@ -482,7 +478,7 @@
         String method = EMPTY;
         String referer = EMPTY;
         String userAgent = EMPTY;
-        if (pattern.equals("combined") && request != null) {
+        if (pattern.equals("combined")) {
             virtualHost = request.getServerName();
             method = request.getMethod();
             referer = request.getHeader("referer");

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=832636&r1=832635&r2=832636&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Wed 
Nov  4 00:54:02 2009
@@ -350,7 +350,7 @@
                                 countDown(attachment.getWriteLatch());
                             }
                         }catch (CancelledKeyException ckx) {
-                            if (sk!=null) sk.cancel();
+                            sk.cancel();
                             countDown(attachment.getReadLatch());
                             countDown(attachment.getWriteLatch());
                         }
@@ -391,4 +391,4 @@
         }
     }
 
-}
\ No newline at end of file
+}



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

Reply via email to