Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory
james.mmbase.org:/tmp/cvs-serv28275/src/org/mmbase/bridge/implementation
Modified Files:
Tag: MMBase-1_8
BasicCloud.java
Log Message:
Use Cache classes not in bridge only in core. Cache classes will start MMbase
even when MMbase is shutting down.
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation
Index: BasicCloud.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/BasicCloud.java,v
retrieving revision 1.161.2.4
retrieving revision 1.161.2.5
diff -u -b -r1.161.2.4 -r1.161.2.5
--- BasicCloud.java 12 Oct 2007 11:53:08 -0000 1.161.2.4
+++ BasicCloud.java 28 Jun 2008 11:57:23 -0000 1.161.2.5
@@ -13,7 +13,6 @@
import java.io.*;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.Queries;
-import org.mmbase.cache.*;
import org.mmbase.module.core.*;
import org.mmbase.module.corebuilders.*;
@@ -29,7 +28,7 @@
* @author Rob Vermeulen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BasicCloud.java,v 1.161.2.4 2007/10/12 11:53:08 michiel Exp $
+ * @version $Id: BasicCloud.java,v 1.161.2.5 2008/06/28 11:57:23 nklasens Exp $
*/
public class BasicCloud implements Cloud, Cloneable, Comparable,
SizeMeasurable, Serializable {
@@ -113,7 +112,7 @@
*/
BasicCloud(String name, String authenticationType, Map loginInfo,
CloudContext cloudContext) {
// get the cloudcontext and mmbase root...
- this.cloudContext = (BasicCloudContext) cloudContext;
+ this.cloudContext = cloudContext;
init();
userContext = mmbaseCop.getAuthentication().login(authenticationType,
loginInfo, null);
if (userContext == null) {
@@ -682,14 +681,8 @@
if (! checked) {
log.warn("Query " + query + " could not be completely modified
by security: Aggregated result might be wrong");
}
- Cache cache = AggregatedResultCache.getCache();
-
- List resultList = (List) cache.get(query);
- if (resultList == null) {
ResultBuilder resultBuilder = new
ResultBuilder(BasicCloudContext.mmb, query);
- resultList =
BasicCloudContext.mmb.getSearchQueryHandler().getNodes(query, resultBuilder);
- cache.put(query, resultList);
- }
+ List resultList = resultBuilder.getResult();
query.markUsed();
NodeManager tempNodeManager = new VirtualNodeManager(query, this);
NodeList resultNodeList = new BasicNodeList(resultList,
tempNodeManager);
@@ -709,31 +702,9 @@
* @since MMBase-1.7
*/
protected List getClusterNodes(Query query) {
-
- // start multilevel cache
- Cache multilevelCache = MultilevelCache.getCache();
-
ClusterBuilder clusterBuilder =
BasicCloudContext.mmb.getClusterBuilder();
- // check multilevel cache if needed
- List resultList = null;
- if (query.getCachePolicy().checkPolicy(query)) {
- resultList = (List)multilevelCache.get(query);
- }
- // if unavailable, obtain from database
- if (resultList == null) {
- log.debug("result list is null, getting from database");
- try {
- resultList = clusterBuilder.getClusterNodes(query);
- } catch (SearchQueryException sqe) {
- throw new BridgeException(query.toString() + ":" +
sqe.getMessage(), sqe);
- }
- if (query.getCachePolicy().checkPolicy(query)) {
- multilevelCache.put(query, resultList);
- }
- }
-
+ List resultList = clusterBuilder.getClusterNodes(query);
query.markUsed();
-
return resultList;
}
@@ -1094,7 +1065,6 @@
}
out.writeObject(props);
out.writeObject(locale);
- log.service("Serialized cloud " + BasicCloud.this + " of " +
BasicCloud.this.getUser());
}
private void writeObject(ObjectOutputStream out) throws IOException {
_writeObject(out);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
