You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by pn...@apache.org on 2003/08/21 18:00:12 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/structure StructureImpl.java ObjectNode.java
pnever 2003/08/21 09:00:12
Modified: src/share/org/apache/slide/structure StructureImpl.java
ObjectNode.java
Log:
Made code more robust - thanks to Oliver Zeigermann for the pointers.
Revision Changes Path
1.28 +5 -5 jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java
Index: StructureImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- StructureImpl.java 18 Aug 2003 06:51:05 -0000 1.27
+++ StructureImpl.java 21 Aug 2003 16:00:12 -0000 1.28
@@ -503,7 +503,7 @@
// TODO: move into Uri class?
private static boolean isStoreRoot(Uri uri) {
- return uri.getRelative().length() == 0;
+ return ("".equals(uri.getRelative()) || "/".equals(uri.getRelative()));
}
// TODO: move somewhere else?
1.10 +8 -5 jakarta-slide/src/share/org/apache/slide/structure/ObjectNode.java
Index: ObjectNode.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/ObjectNode.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ObjectNode.java 18 Aug 2003 06:51:05 -0000 1.9
+++ ObjectNode.java 21 Aug 2003 16:00:12 -0000 1.10
@@ -493,7 +493,10 @@
* @param child an ObjectNode
*/
public void addBinding( String bindingName, ObjectNode source ) {
- String childUri = this.uri+"/"+bindingName;
+ String childUri = (this.uri.endsWith("/")
+ ? this.uri+bindingName
+ : this.uri+"/"+bindingName);
+
if (!hasChild(childUri)) {
if(childrenShared) {
// Lazy cloning on first write access