[jboss-cvs] JBossAS SVN: r76734 - projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/lang.

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

Author: ALRubinger
Date: 2008-08-06 23:47:47 -0400 (Wed, 06 Aug 2008)
New Revision: 76734

Modified:
   projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/lang/SerializableMethod.java
Log:
[EJBTHREE-1400] Set SerializableMethod actualClass to declaringClass if not specified

Modified: projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/lang/SerializableMethod.java
===================================================================
--- projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/lang/SerializableMethod.java	2008-08-07 03:45:23 UTC (rev 76733)
+++ projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/lang/SerializableMethod.java	2008-08-07 03:47:47 UTC (rev 76734)
@@ -27,6 +27,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.jboss.logging.Logger;
+
 /**
  * SerializableMethod
  * 
@@ -46,6 +48,8 @@
 
    private static final long serialVersionUID = 1L;
 
+   private static final Logger log = Logger.getLogger(SerializableMethod.class);
+
    // ------------------------------------------------------------------------------||
    // Instance Members -------------------------------------------------------------||
    // ------------------------------------------------------------------------------||
@@ -78,7 +82,7 @@
    // ------------------------------------------------------------------------------||
    // Constructors -----------------------------------------------------------------||
    // ------------------------------------------------------------------------------||
-   
+
    /**
     * Constructor
     * 
@@ -108,7 +112,7 @@
       // Pass to alternate constructor
       this(method, actualClass.getName());
    }
-   
+
    /**
     * Constructor
     * 
@@ -290,7 +294,7 @@
    protected Class<?> getClassFromName(String name, ClassLoader cl)
    {
       // Perform assertions
-      assert cl != null : ClassLoader.class.getSimpleName() + "must be defined.";
+      assert cl != null : ClassLoader.class.getSimpleName() + " must be defined.";
 
       /*
        * Handle Primitives
@@ -399,6 +403,16 @@
 
    public void setActualClassName(String actualClassName)
    {
+      // If no actual class name is specified
+      if (actualClassName == null || actualClassName.trim().length() == 0)
+      {
+         // Use the declaring class name
+         String declaringClassName = this.getDeclaringClassName();
+         assert declaringClassName != null && declaringClassName.trim().length() > 0 : "Cannot implicitly set actual class to declaring class as declaring class is not defined";
+         actualClassName = declaringClassName;
+         log.debug("Actual class name has not been explicitly specified, so defaulting to declaring class name: "
+               + declaringClassName);
+      }
       this.actualClassName = actualClassName;
    }