[jboss-cvs] JBossAS SVN: r74994 - projects/metadata/trunk/src/main/java/org/jboss/metadata/lang.

[jboss-cvs-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2008-06-24 11:46:17 -0400 (Tue, 24 Jun 2008)
New Revision: 74994

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/lang/ClassHelper.java
Log:
[JBMETA-15] fix ClassHelper

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/lang/ClassHelper.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/lang/ClassHelper.java	2008-06-24 15:33:59 UTC (rev 74993)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/lang/ClassHelper.java	2008-06-24 15:46:17 UTC (rev 74994)
@@ -37,17 +37,14 @@
    {
       if(cls == null)
          return null;
-      
+
       Class<?> interfaces[] = cls.getInterfaces();
-      switch(interfaces.length)
-      {
-         case 0:
-            return findDefaultInterface(cls.getSuperclass());
-         case 1:
-            return interfaces[0];
-         default:
-            return extractInterface(interfaces);
-      }
+
+      Class<?> iFace = extractInterface(interfaces);
+      if(iFace != null)
+         return iFace;
+      
+      return findDefaultInterface(cls.getSuperclass());
    }
    
    /**
@@ -100,4 +97,5 @@
          throw new IllegalArgumentException("Class " + cls + " does not have a default interface");
       return defaultInterface;
    }
+      
 }