Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv26974
Modified Files:
BuilderReader.java
Log Message:
MMB-1504
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/xml
See also: http://www.mmbase.org/jira/browse/MMB-1504
Index: BuilderReader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/BuilderReader.java,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- BuilderReader.java 12 Sep 2008 14:28:34 -0000 1.109
+++ BuilderReader.java 22 Sep 2008 15:57:07 -0000 1.110
@@ -39,7 +39,7 @@
* @author Rico Jansen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BuilderReader.java,v 1.109 2008/09/12 14:28:34 michiel Exp $
+ * @version $Id: BuilderReader.java,v 1.110 2008/09/22 15:57:07 michiel Exp $
*/
public class BuilderReader extends DocumentReader {
@@ -1017,6 +1017,10 @@
// default for notnull is value of required
def.setNotNull("true".equals(fieldNotNull) || ("".equals(fieldNotNull)
&& dataType.isRequired()));
+ if (def.isNotNull() && ! "false".equalsIgnoreCase(fieldRequired)) { //
If not null, it _must_ be required, unless explicitely not so (MMB-1504)
+ dataType.setRequired(true);
+ }
+
// set unique property, but only if given
if ("implied".equalsIgnoreCase(fieldUnique)) {
dataType.setUnique(true);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
