[jboss-cvs] JBossAS SVN: r76063 - in projects/microcontainer/trunk: kernel/src/main/org/jboss/beans/metadata/plugins and 1 other directory.

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

Author: alesj
Date: 2008-07-21 13:04:34 -0400 (Mon, 21 Jul 2008)
New Revision: 76063

Modified:
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAliasMetaData.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractNamedAliasMetaData.java
Log:
Null check.
Log info.

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java	2008-07-21 15:15:10 UTC (rev 76062)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java	2008-07-21 17:04:34 UTC (rev 76063)
@@ -246,6 +246,6 @@
     */
    protected void toHumanReadableString(StringBuilder builder)
    {
-      builder.append("Depends on '").append(getIDependOn());
+      builder.append("Depends on '").append(getIDependOn()).append("'");
    }
 }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAliasMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAliasMetaData.java	2008-07-21 15:15:10 UTC (rev 76062)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAliasMetaData.java	2008-07-21 17:04:34 UTC (rev 76063)
@@ -50,6 +50,9 @@
 
    public Object getAliasValue()
    {
+      if (alias == null)
+         throw new IllegalArgumentException("Alias should not be null");
+
       return alias;
    }
 
@@ -83,17 +86,17 @@
 
    public void toString(JBossStringBuilder buffer)
    {
-      buffer.append("alias=").append(alias);
+      buffer.append("alias=").append(getAliasValue());
    }
 
    public void toShortString(JBossStringBuilder buffer)
    {
-      buffer.append(alias);
+      buffer.append(getAliasValue());
    }
 
    protected int getHashCode()
    {
-      return alias.hashCode();
+      return getAliasValue().hashCode();
    }
 
    public boolean equals(Object object)
@@ -102,8 +105,7 @@
          return false;
 
       AbstractAliasMetaData amd = (AbstractAliasMetaData)object;
-      // this is what we probably want? - never saw duplicate annotation on a bean/prop/...
-      return alias.equals(amd.alias);
+      return getAliasValue().equals(amd.getAliasValue());
    }
 
    public AbstractAliasMetaData clone()

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractNamedAliasMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractNamedAliasMetaData.java	2008-07-21 15:15:10 UTC (rev 76062)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractNamedAliasMetaData.java	2008-07-21 17:04:34 UTC (rev 76063)
@@ -51,6 +51,9 @@
 
    public Object getName()
    {
+      if (name == null)
+         throw new IllegalArgumentException("Name should not be null");
+
       return name;
    }
 
@@ -67,13 +70,13 @@
 
    public void toString(JBossStringBuilder buffer)
    {
-      buffer.append("name=").append(name).append(" ");
+      buffer.append("name=").append(getName()).append(" ");
       super.toString(buffer);
    }
 
    protected int getHashCode()
    {
-      return name.hashCode() + 7 * super.getHashCode();
+      return getName().hashCode() + 7 * super.getHashCode();
    }
 
    public boolean equals(Object object)
@@ -82,7 +85,7 @@
          return false;
       
       AbstractNamedAliasMetaData amd = (AbstractNamedAliasMetaData)object;
-      return name.equals(amd.name);
+      return getName().equals(amd.getName());
    }
 
    public AbstractNamedAliasMetaData clone()