User: dsundstrom
Date: 02/01/16 13:09:06
Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata
JDBCEntityMetaData.java
Log:
Allow eager-load-group to be empty, which means that no fields are to be
eager loaded.
Revision Changes Path
1.15 +12 -7
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCEntityMetaData.java
Index: JDBCEntityMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCEntityMetaData.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JDBCEntityMetaData.java 2002/01/15 21:12:53 1.14
+++ JDBCEntityMetaData.java 2002/01/16 21:09:06 1.15
@@ -29,7 +29,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Dirk Zimmermann</a>
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*/
public final class JDBCEntityMetaData {
/**
@@ -483,13 +483,18 @@
Element eagerLoadGroupElement = MetaData.getOptionalChild(
element, "eager-load-group");
if(eagerLoadGroupElement != null) {
- eagerLoadGroup = MetaData.getElementContent(eagerLoadGroupElement);
- if(eagerLoadGroup != null
- && !eagerLoadGroup.equals("*")
- && !loadGroups.containsKey(eagerLoadGroup)) {
+ String eagerLoadGroupTmp =
+ MetaData.getElementContent(eagerLoadGroupElement);
+ if(eagerLoadGroupTmp != null && eagerLoadGroupTmp.trim().length()==0) {
+ eagerLoadGroupTmp = null;
+ }
+ if(eagerLoadGroupTmp != null
+ && !eagerLoadGroupTmp.equals("*")
+ && !loadGroups.containsKey(eagerLoadGroupTmp)) {
throw new DeploymentException("Eager load group not found: " +
- "eager-load-group=" + eagerLoadGroup);
+ "eager-load-group=" + eagerLoadGroupTmp);
}
+ eagerLoadGroup = eagerLoadGroupTmp;
} else {
eagerLoadGroup = defaultValues.getEagerLoadGroup();
}
@@ -614,7 +619,7 @@
while(loadGroupNames.hasNext()) {
String loadGroupName = MetaData.getElementContent(
(Element)loadGroupNames.next());
- if(!eagerLoadGroup.equals("*")
+ if(!loadGroupName.equals("*")
&& !loadGroups.containsKey(loadGroupName)) {
throw new DeploymentException("Lazy load group not found: " +
"load-group-name=" + loadGroupName);
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
