[MMBASE CVS] src/org/mmbase/util/xml BuilderReader.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv20043

Modified Files:
        BuilderReader.java 
Log Message:
  MMB-1586


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/xml
See also: http://www.mmbase.org/jira/browse/MMB-1586


Index: BuilderReader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/BuilderReader.java,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- BuilderReader.java  5 Dec 2007 16:30:54 -0000       1.91
+++ BuilderReader.java  28 Jan 2008 16:28:00 -0000      1.92
@@ -19,6 +19,7 @@
 import org.mmbase.core.util.Fields;
 import org.mmbase.datatypes.*;
 import org.mmbase.datatypes.util.xml.DataTypeReader;
+import org.mmbase.datatypes.util.xml.DependencyException;
 import org.mmbase.module.core.MMBase;
 import org.mmbase.module.core.MMObjectBuilder;
 import org.mmbase.storage.util.Index;
@@ -37,7 +38,7 @@
  * @author Rico Jansen
  * @author Pierre van Rooden
  * @author Michiel Meeuwissen
- * @version $Id: BuilderReader.java,v 1.91 2007/12/05 16:30:54 michiel Exp $
+ * @version $Id: BuilderReader.java,v 1.92 2008/01/28 16:28:00 michiel Exp $
  */
 public class BuilderReader extends DocumentReader {
 
@@ -498,14 +499,17 @@
                             }
                         };
                 }
-                Function existing = results.get(functionName);
+
+                String key = function.getName();
+                Function existing = results.get(key);
+
                 if (existing != null) {
-                    log.info("Function " + functionName + " already defined, 
will combine it");
+                    log.info("Function " + key + " already defined, will 
combine it");
                     CombinedFunction cf;
                     if (existing instanceof CombinedFunction) {
                         cf = (CombinedFunction) existing;
                     } else {
-                        cf = new CombinedFunction(functionName);
+                        cf = new CombinedFunction(key);
                         cf.addFunction(existing);
                     }
                     cf.addFunction(function);
@@ -515,8 +519,10 @@
                 NodeFunction nf = NodeFunction.wrap(function);
                 if (nf != null) function = nf;
 
-                results.put(functionName, function);
+                results.put(key, function);
                 log.debug("functions are now: " + results);
+            } catch (ClassNotFoundException cnfe) {
+                log.warn(cnfe.getMessage());
             } catch (Throwable e) {
                 log.error(e.getMessage(), e);
             }
@@ -727,7 +733,11 @@
                     requestedBaseDataType = baseDataType;
                 }
             }
+            try {
             dataType = DataTypeReader.readDataType(dataTypeElement, 
requestedBaseDataType, collector).dataType;
+            } catch (DependencyException de) {
+                dataType = de.fallback();
+            }
             if (log.isDebugEnabled()) log.debug("Found datatype " + dataType + 
" for field " + fieldName);
         }
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs