Update of /var/cvs/src/org/mmbase/storage/search/implementation
In directory james.mmbase.org:/tmp/cvs-serv32026/search/implementation
Modified Files:
BasicSearchQuery.java
Log Message:
a method to determin the 'datadir' (should perhaps be moved to mmbase.java
itself)
See also:
http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage/search/implementation
Index: BasicSearchQuery.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/search/implementation/BasicSearchQuery.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- BasicSearchQuery.java 6 Nov 2007 17:01:34 -0000 1.44
+++ BasicSearchQuery.java 22 Feb 2008 12:28:19 -0000 1.45
@@ -23,7 +23,7 @@
* Basic implementation.
*
* @author Rob van Maris
- * @version $Id: BasicSearchQuery.java,v 1.44 2007/11/06 17:01:34 michiel Exp $
+ * @version $Id: BasicSearchQuery.java,v 1.45 2008/02/22 12:28:19 michiel Exp $
* @since MMBase-1.7
*/
public class BasicSearchQuery implements SearchQuery, Cloneable {
@@ -445,12 +445,21 @@
// http://www.mmbase.org/jira/browse/MMB-1435,
// Using fields with "ORDER_CREATE" only returns fields actually in
storage, and also in the
// right order, which is import for microsoft JDBC.
+ if (builder != null) {
for (CoreField field : builder.getFields(NodeManager.ORDER_CREATE)) {
if (field.inStorage()) {
BasicStepField stepField = addField(step, field);
mapField(field, stepField);
}
}
+ } else {
+ // this can e.g. happen during shut-down of mmbase
+ if (mmb.getState()) {
+ throw new RuntimeException("Step is describing non-existing
builder " + step.getTableName());
+ } else {
+ log.debug("Step is describing non-existing builder " +
step.getTableName());
+ }
+ }
hasChangedHashcode = true;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
