Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv15012/bridge/implementation
Modified Files:
BasicNode.java
Log Message:
MMB-617 occured again, fixed again
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation
See also: http://www.mmbase.org/jira/browse/MMB-617
Index: BasicNode.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/BasicNode.java,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -b -r1.227 -r1.228
--- BasicNode.java 21 Mar 2008 09:07:56 -0000 1.227
+++ BasicNode.java 13 Jun 2008 10:47:22 -0000 1.228
@@ -31,7 +31,7 @@
* @author Rob Vermeulen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BasicNode.java,v 1.227 2008/03/21 09:07:56 nklasens Exp $
+ * @version $Id: BasicNode.java,v 1.228 2008/06/13 10:47:22 michiel Exp $
* @see org.mmbase.bridge.Node
* @see org.mmbase.module.core.MMObjectNode
*/
@@ -885,29 +885,18 @@
q.setConstraint(c);
NodeList aliases = oalias.getList(q);
StringList result = new BasicStringList();
- NodeIterator i = aliases.nodeIterator();
- while (i.hasNext()) {
- Node alias = i.nextNode();
+ for (Node alias : aliases) {
result.add(alias.getStringValue("name"));
}
+ if (isNew()) {
+ // for bug #6185. MMB-617
- // There might be aliases in temporary nodes
- // This is quite a dirty (and probably also slow) hack
- // for bug #6185.
- // Usually the temporaryNodes hashtable shall not be
- // too full.
- if (cloud instanceof Transaction) {
- Map<String, MMObjectNode> tnodes = MMObjectBuilder.temporaryNodes;
- for (MMObjectNode mynode : tnodes.values()) {
- if (mynode.getName().equals("oalias")){
- String dest = mynode.getStringValue("_destination");
- if ((account + "_" + temporaryNodeId).equals(dest)) {
- result.add(mynode.getStringValue("name"));
- }
- }
+ if (getNode().aliases != null) {
+ result.addAll(getNode().aliases);
}
}
+
return result;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
