Author: pierre
Date: 2010-03-08 16:41:15 +0100 (Mon, 08 Mar 2010)
New Revision: 41288
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/util/xml/BuilderReader.java
Log:
MMB-1907
Modified: mmbase/trunk/core/src/main/java/org/mmbase/util/xml/BuilderReader.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/util/xml/BuilderReader.java
2010-03-08 15:41:08 UTC (rev 41287)
+++ mmbase/trunk/core/src/main/java/org/mmbase/util/xml/BuilderReader.java
2010-03-08 15:41:15 UTC (rev 41288)
@@ -105,7 +105,6 @@
for (String s :
loader.getResourcePaths(Pattern.compile(getName()+ "\\.xml"), true)) {
for (java.net.URL url : loader.getResourceList(s)) {
try {
-
if (! url.openConnection().getDoInput()) continue;
org.w3c.dom.Document doc =
ResourceLoader.getDocument(url, true, BuilderReader.class);
if (!
doc.getDocumentElement().getTagName().equals("builder")) {
@@ -217,7 +216,7 @@
try {
if (def != null) {
def.rewrite();
- DataType dataType =
decodeDataType(builder.getTableName(), collector, def.getName(), field,
def.getType(), def.getListItemType(), false);
+ DataType dataType = decodeDataType((builder != null ?
builder.getTableName() : null), collector, def.getName(), field, def.getType(),
def.getListItemType(), false);
if (dataType != null) {
def.setDataType(dataType); // replace datatype
}
@@ -497,7 +496,7 @@
}
// datatype
- DataType dataType = decodeDataType(builder.getTableName(), collector,
fieldName, field, type, listItemType, true);
+ DataType dataType = decodeDataType((builder != null ?
builder.getTableName() : null), collector, fieldName, field, type,
listItemType, true);
// determine type from datatype, if possible)
if (type == Field.TYPE_UNKNOWN) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
