[jboss-cvs] JBossAS SVN: r95787 - projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec.

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

Author: remy.maucherat at jboss.com
Date: 2009-10-29 18:10:14 -0400 (Thu, 29 Oct 2009)
New Revision: 95787

Modified:
   projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationMetaData.java
Log:
- NPE fix with augment.

Modified: projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationMetaData.java
===================================================================
--- projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationMetaData.java	2009-10-29 22:09:54 UTC (rev 95786)
+++ projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationMetaData.java	2009-10-29 22:10:14 UTC (rev 95787)
@@ -173,7 +173,8 @@
       // Mapped name
       if (getMappedName() == null)
       {
-         setMappedName(augment.getMappedName());
+         if (augment.getMappedName() != null)
+            setMappedName(augment.getMappedName());
       }
       else if (augment.getMappedName() != null)
       {