Author: michiel
Date: 2009-05-30 09:22:26 +0200 (Sat, 30 May 2009)
New Revision: 35530
Modified:
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
Log:
having more then one context providing builder was broken
Modified:
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
2009-05-29 15:02:35 UTC (rev 35529)
+++
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
2009-05-30 07:22:26 UTC (rev 35530)
@@ -71,7 +71,9 @@
List<NodeSearchQuery> temp = new ArrayList<NodeSearchQuery>();
for (String bulName : b) {
MMObjectBuilder bul = MMBase.getMMBase().getBuilder(bulName);
- if (bul == null) log.warn("Cannot add '" + bulName + "' to builder
list (it does not exist)");
+ if (bul == null) {
+ log.warn("Cannot add '" + bulName + "' to builder list (it
does not exist)");
+ }
NodeSearchQuery q = new NodeSearchQuery(bul);
q.setModifiable(false);
temp.add(q);
@@ -149,11 +151,12 @@
protected SortedSet<String> getAllContexts() {
if (all == null) {
try {
+ all = new TreeSet<String>();
for (NodeSearchQuery q : getContextQueries()) {
MMObjectBuilder contextBuilder =
MMBase.getMMBase().getBuilder(q.getSteps().get(0).getTableName());
Iterator<MMObjectNode> i =
contextBuilder.getNodes(q).iterator(); // list all Contextes simply..
- all = new TreeSet<String>();
String nameField =
getContextNameField(q.getBuilder().getTableName());
+ log.service("Using " +
MMBase.getMMBase().getSearchQueryHandler().createSqlString(q) + " for all
context");
while (i.hasNext()) {
MMObjectNode context = i.next();
all.add(context.getStringValue(nameField));
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
