User: salborini
Date: 00/10/05 14:43:41
Modified: src/main/org/jboss/ejb/plugins/jaws/metadata
JawsEntityMetaData.java
Log:
Unexpected cmp-fields (in jaws.xml but not in ejb-jar.xml) threw NullPointerException
Revision Changes Path
1.2 +5 -1
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsEntityMetaData.java
Index: JawsEntityMetaData.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsEntityMetaData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JawsEntityMetaData.java 2000/09/09 02:47:20 1.1
+++ JawsEntityMetaData.java 2000/10/05 21:43:40 1.2
@@ -30,7 +30,7 @@
*
* @see <related>
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class JawsEntityMetaData extends MetaData implements XmlLoadable {
// Constants -----------------------------------------------------
@@ -216,7 +216,11 @@
while (iterator.hasNext()) {
Element cmpField = (Element)iterator.next();
String fieldName = getElementContent(getUniqueChild(cmpField,
"field-name"));
+
CMPFieldMetaData cmpFieldMetaData =
getCMPFieldByName(fieldName);
+ if (cmpFieldMetaData == null)
+ throw new DeploymentException("cmp-field
'"+fieldName+"' found in jaws.xml but not in ejb-jar.xml");
+
cmpFieldMetaData.importXml(cmpField);
}
