Update of /var/cvs/src/org/mmbase/cache
In directory james.mmbase.org:/tmp/cvs-serv4963
Modified Files:
BasicReleaseStrategy.java
Log Message:
trying to avoid NPE's. MMB-1591
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/cache
See also: http://www.mmbase.org/jira/browse/MMB-1591
Index: BasicReleaseStrategy.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/cache/BasicReleaseStrategy.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- BasicReleaseStrategy.java 17 Sep 2007 08:52:54 -0000 1.16
+++ BasicReleaseStrategy.java 12 Feb 2008 16:27:11 -0000 1.17
@@ -29,7 +29,7 @@
*
* @author Ernst Bunders
* @since MMBase-1.8
- * @version $Id: BasicReleaseStrategy.java,v 1.16 2007/09/17 08:52:54 michiel
Exp $
+ * @version $Id: BasicReleaseStrategy.java,v 1.17 2008/02/12 16:27:11 michiel
Exp $
*/
public class BasicReleaseStrategy extends ReleaseStrategy {
@@ -62,10 +62,21 @@
MMBase mmb = MMBase.getMMBase();
String eventTable = event.getBuilderName();
MMObjectBuilder eventBuilder = mmb.getBuilder(eventTable);
+ if (eventBuilder == null) {
+ eventBuilder = mmb.getBuilder("object");
+ eventTable = "object";
+ }
for (Step step : query.getSteps()) {
String table = step.getTableName();
+ if (table == null) {
+ // I think this cannot happen
+ log.warn("Found null in a query !" + query);
+ continue;
+ }
+ MMObjectBuilder stepBuilder = mmb.getBuilder(table);
+ if (stepBuilder == null) stepBuilder = mmb.getBuilder("object");
if (! (table.equals(eventTable) ||
- eventBuilder.isExtensionOf(mmb.getBuilder(table))))
continue;
+ eventBuilder.isExtensionOf(stepBuilder))) continue;
Set<Integer> nodes = step.getNodes();
if (nodes == null || nodes.size() == 0 ||
nodes.contains(event.getNodeNumber())) {
return true;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
