pnever 2003/09/16 08:43:41
Modified: src/share/org/apache/slide/structure ObjectNode.java
Log:
Fixed the fix :-). Thanks again to Martin Holz:
You have to check the return value of parent() now.
For example
ObjectNode p = new SubjectNode( new UriPath(uri).parent().toString() );
at line 544 of ObjectNode.java will cause a NPE, if uri is '/'.
Revision Changes Path
1.14 +12 -6
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ObjectNode.java 16 Sep 2003 10:11:06 -0000 1.13
+++ ObjectNode.java 16 Sep 2003 15:43:40 -0000 1.14
@@ -541,8 +541,14 @@
s.setUuri( s.getUri() );
addBinding( lastUriSegment(c), s );
}
- ObjectNode p = new SubjectNode( new UriPath(uri).parent().toString() );
- p.setUuri( p.getUri() );
+ ObjectNode p = null;
+ UriPath up = new UriPath(uri);
+ UriPath pup = up.parent();
+ if (pup != null) {
+ String pUri = pup.toString();
+ p = new SubjectNode( pUri );
+ p.setUuri( p.getUri() );
+ }
addParentBinding( lastUriSegment(), p );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
