svn commit: r1634228 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/http/mapper/Mapper.java

[kkolinko]

Author: kkolinko
Date: Sat Oct 25 14:02:00 2014
New Revision: 1634228

URL: http://svn.apache.org/r1634228
Log:
Fix generics warnings in Mapper.
It is just some local variables. No change in functionality or APIs.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1634228&r1=1634227&r2=1634228&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Oct 25 14:02:00 2014
@@ -48,15 +48,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt
   -1:
 
-* Fix generics warnings in Mapper.
-
-  Motivation: Resolve IDE warnings to make it easier to spot more serious
-  errors when working on this class.
-  It is just some local variables. No change in functionality or APIs.
-  
https://people.apache.org/~kkolinko/patches/2014-06-23_tc6_Mapper_generics.patch
-  +1: kkolinko, markt, schultz
-  -1:
-
 * Mitigate POODLE by disabling SSLv3 by default for JSSE
   http://people.apache.org/~markt/patches/2014-10-21-poodle-tc6-v2.patch
   +1: markt, schultz

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java?rev=1634228&r1=1634227&r2=1634228&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java 
Sat Oct 25 14:02:00 2014
@@ -289,7 +289,7 @@ public final class Mapper {
      * @return The context names
      */
     public String[] getContextNames() {
-        List list=new ArrayList();
+        List<String> list = new ArrayList<String>();
         for( int i=0; i<hosts.length; i++ ) {
             for( int j=0; j<hosts[i].contextList.contexts.length; j++ ) {
                 String cname=hosts[i].contextList.contexts[j].name;
@@ -298,7 +298,7 @@ public final class Mapper {
             }
         }
         String res[] = new String[list.size()];
-        return (String[])list.toArray(res);
+        return list.toArray(res);
     }
 
 
@@ -508,7 +508,7 @@ public final class Mapper {
     }
 
     public String[] getWrapperNames( String host, String context ) {
-        List list=new ArrayList();
+        List<String> list = new ArrayList<String>();
         if( host==null ) host="";
         if( context==null ) context="";
         for( int i=0; i<hosts.length; i++ ) {
@@ -532,7 +532,7 @@ public final class Mapper {
             }
         }
         String res[]=new String[list.size()];
-        return (String[])list.toArray(res);
+        return list.toArray(res);
     }
 
 



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