[jboss-cvs] JBossAS SVN: r72890 - projects/jboss-mdr/trunk/src/main/org/jboss/metadata/spi/signature/javassist.

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

Author: alesj
Date: 2008-04-30 07:46:40 -0400 (Wed, 30 Apr 2008)
New Revision: 72890

Modified:
   projects/jboss-mdr/trunk/src/main/org/jboss/metadata/spi/signature/javassist/JavassistSignatureFactory.java
Log:
Remove javassist NFE.

Modified: projects/jboss-mdr/trunk/src/main/org/jboss/metadata/spi/signature/javassist/JavassistSignatureFactory.java
===================================================================
--- projects/jboss-mdr/trunk/src/main/org/jboss/metadata/spi/signature/javassist/JavassistSignatureFactory.java	2008-04-30 11:22:09 UTC (rev 72889)
+++ projects/jboss-mdr/trunk/src/main/org/jboss/metadata/spi/signature/javassist/JavassistSignatureFactory.java	2008-04-30 11:46:40 UTC (rev 72890)
@@ -42,28 +42,34 @@
     *
     * @param member the member
     * @return the result
-    * @throws javassist.NotFoundException for any error
     */
-   public static Signature getSignature(CtMember member) throws NotFoundException
+   public static Signature getSignature(CtMember member)
    {
       if (member == null)
          throw new IllegalArgumentException("Null member");
 
-      if (member instanceof CtMethod)
+      try
       {
-         CtMethod method = CtMethod.class.cast(member);
-         return new JavassistMethodSignature(method);
+         if (member instanceof CtMethod)
+         {
+            CtMethod method = CtMethod.class.cast(member);
+            return new JavassistMethodSignature(method);
+         }
+         if (member instanceof CtField)
+         {
+            CtField field = CtField.class.cast(member);
+            return new JavassistFieldSignature(field);
+         }
+         if (member instanceof CtConstructor)
+         {
+            CtConstructor constructor = CtConstructor.class.cast(member);
+            return new JavassistConstructorSignature(constructor);
+         }
       }
-      if (member instanceof CtField)
+      catch (NotFoundException e)
       {
-         CtField field = CtField.class.cast(member);
-         return new JavassistFieldSignature(field);
+         throw raiseClassNotFound(member.getName(), e);
       }
-      if (member instanceof CtConstructor)
-      {
-         CtConstructor constructor = CtConstructor.class.cast(member);
-         return new JavassistConstructorSignature(constructor);
-      }
       throw new IllegalArgumentException("Unknown member: " + member);
    }