Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv15298
Modified Files:
TemporaryNodeManager.java
Log Message:
scan didn't compile any more
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
Index: TemporaryNodeManager.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/TemporaryNodeManager.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- TemporaryNodeManager.java 7 Jul 2008 11:10:59 -0000 1.53
+++ TemporaryNodeManager.java 10 Jul 2008 08:24:43 -0000 1.54
@@ -20,7 +20,7 @@
* @javadoc
*
* @author Rico Jansen
- * @version $Id: TemporaryNodeManager.java,v 1.53 2008/07/07 11:10:59 michiel
Exp $
+ * @version $Id: TemporaryNodeManager.java,v 1.54 2008/07/10 08:24:43 michiel
Exp $
*/
public class TemporaryNodeManager {
@@ -136,16 +136,16 @@
* the key if sucessfull, <code>null</code> otherwise.
*
*/
- public String getObject(String owner, String key) {
- MMObjectNode node = MMObjectBuilder.getTmpNode(getTmpKey(owner, key));
+ public String getObject(final String owner, final String key, final String
dbkey) {
+ String tmpKey = getTmpKey(owner, key);
+ MMObjectNode node = MMObjectBuilder.getTmpNode(tmpKey);
if (node == null) {
- log.debug("getObject not tmp node found " + key);
MMObjectBuilder bul = mmbase.getBuilder("object");
- node = bul.getNode(key, false);
+ node = bul.getNode(dbkey, false);
if (node == null) {
- log.warn("Node not found in database " + key);
+ log.warn("Node not found in database " + dbkey);
} else {
- MMObjectBuilder.putTmpNode(getTmpKey(owner, key), node);
+ MMObjectBuilder.putTmpNode(tmpKey, node);
}
}
if (node != null) {
@@ -154,6 +154,12 @@
return null;
}
}
+ /**
+ * @since MMBase-1.9
+ */
+ public String getObject(String owner, String key) {
+ return getObject(owner, key, key);
+ }
/**
* @javadoc
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
