Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/tree
In directory
james.mmbase.org:/tmp/cvs-serv6489/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/tree
Modified Files:
Tag: v1_2
PageTree.java
Log Message:
CMSC-639 Backported some logic to prevent a NPE when trying to remove a page
with a non-existing urlfragment
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/tree
See also: http://www.mmbase.org/jira/browse/CMSC-639
Index: PageTree.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/tree/PageTree.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- PageTree.java 5 Sep 2006 11:46:43 -0000 1.1
+++ PageTree.java 7 Apr 2009 11:57:00 -0000 1.1.2.1
@@ -43,12 +43,15 @@
rwl.writeLock().lock();
try {
PageTreeNode parentNode = getPath(path);
+ if(parentNode != null) {
PageTreeNode oldNode = parentNode.getChildById(destinationNumber);
if (oldNode != null) {
remove(oldNode);
}
return oldNode;
}
+ return null;
+ }
finally {
rwl.writeLock().unlock();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
