[jbossweb-commits] JBossWeb SVN: r2285 - branches/7.4.x/src/main/java/org/apache/tomcat/websocket.

[jbossweb-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2013-10-18 04:30:12 -0400 (Fri, 18 Oct 2013)
New Revision: 2285

Modified:
   branches/7.4.x/src/main/java/org/apache/tomcat/websocket/Util.java
Log:
Port patch for generic type handling for WS components.

Modified: branches/7.4.x/src/main/java/org/apache/tomcat/websocket/Util.java
===================================================================
--- branches/7.4.x/src/main/java/org/apache/tomcat/websocket/Util.java	2013-10-17 12:26:41 UTC (rev 2284)
+++ branches/7.4.x/src/main/java/org/apache/tomcat/websocket/Util.java	2013-10-18 08:30:12 UTC (rev 2285)
@@ -163,8 +163,8 @@
     }
 
 
-    public static Class<?> getDecoderType(Class<? extends Decoder> Decoder) {
-        return (Class<?>) Util.getGenericType(Decoder.class, Decoder);
+    public static Class<?> getDecoderType(Class<? extends Decoder> decoder) {
+        return (Class<?>) Util.getGenericType(Decoder.class, decoder);
     }
 
 
@@ -228,6 +228,8 @@
     private static Object getTypeParameter(Class<?> clazz, Type argType) {
         if (argType instanceof Class<?>) {
             return argType;
+        } else if (argType instanceof ParameterizedType) {
+            return ((ParameterizedType) argType).getRawType();
         } else {
             TypeVariable<?>[] tvs = clazz.getTypeParameters();
             for (int i = 0; i < tvs.length; i++) {