Commit 65b9214d authored by Armando Jagucki's avatar Armando Jagucki Committed by ajagucki

Cleaned up IQPEPHandler and removed nodeID hierarchical renaming semantics in...

Cleaned up IQPEPHandler and removed nodeID hierarchical renaming semantics in PubSubEngine (which conflicted with PEP [see 12.12 of XEP-0060 as to why it could be safely removed]).

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches@8821 b35dd754-fafc-0310-a699-88a17e54d16e
parent b463378c
...@@ -1102,11 +1102,6 @@ public class PubSubEngine { ...@@ -1102,11 +1102,6 @@ public class PubSubEngine {
return; return;
} }
parentNode = (CollectionNode) tempNode; parentNode = (CollectionNode) tempNode;
// If requested new nodeID does not contain parent nodeID then add
// the parent nodeID to the beginging of the new nodeID
if (!newNodeID.startsWith(parentNodeID)) {
newNodeID = parentNodeID + "/" + newNodeID;
}
} }
} }
field = completedForm.getField("pubsub#node_type"); field = completedForm.getField("pubsub#node_type");
...@@ -1122,10 +1117,6 @@ public class PubSubEngine { ...@@ -1122,10 +1117,6 @@ public class PubSubEngine {
// If no parent was defined then use the root collection node // If no parent was defined then use the root collection node
if (parentNode == null && service.isCollectionNodesSupported()) { if (parentNode == null && service.isCollectionNodesSupported()) {
parentNode = service.getRootCollectionNode(); parentNode = service.getRootCollectionNode();
// Calculate new nodeID for the new node
if (!newNodeID.startsWith(parentNode.getNodeID() + "/")) {
newNodeID = parentNode.getNodeID() + "/" + newNodeID;
}
} }
// Check that the requested nodeID does not exist // Check that the requested nodeID does not exist
Node existingNode = service.getNode(newNodeID); Node existingNode = service.getNode(newNodeID);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment