luetzkendorf 2004/08/18 01:37:24
Modified: src/share/org/apache/slide/common Tag:
SLIDE_2_1_RELEASE_BRANCH XMLUnmarshaller.java
src/share/org/apache/slide/structure Tag:
SLIDE_2_1_RELEASE_BRANCH StructureImpl.java
Log:
fix for bug 30695
Revision Changes Path
No revision
No revision
1.32.2.1 +15 -21
jakarta-slide/src/share/org/apache/slide/common/XMLUnmarshaller.java
Index: XMLUnmarshaller.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/XMLUnmarshaller.java,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -u -r1.32 -r1.32.2.1
--- XMLUnmarshaller.java 9 Aug 2004 08:58:39 -0000 1.32
+++ XMLUnmarshaller.java 18 Aug 2004 08:37:24 -0000 1.32.2.1
@@ -143,28 +143,22 @@
throw new UnknownObjectClassException(className);
}
- if (uri.equals("/")) {
- // FIXME
- } else {
-
- try {
- if (object instanceof LinkNode) {
- String linkedUri =
- objectDefinition.getAttribute("linkedUri");
- accessToken.getStructureHelper().createLink
+ try {
+ if (object instanceof LinkNode) {
+ String linkedUri =
+ objectDefinition.getAttribute("linkedUri");
+ accessToken.getStructureHelper().createLink
(token, (LinkNode) object, uri,
new SubjectNode(linkedUri));
- } else {
- accessToken.getStructureHelper().create
+ } else {
+ accessToken.getStructureHelper().create
(token, object, uri);
- }
- } catch (ObjectAlreadyExistsException e) {
- // Ignore, log and continue
- accessToken.getLogger().log
+ }
+ } catch (ObjectAlreadyExistsException e) {
+ // Ignore, log and continue
+ accessToken.getLogger().log
("Object already exists at " + uri,
LOG_CHANNEL, Logger.INFO);
- }
-
}
// Retrieving the list of permissions on the object
No revision
No revision
1.49.2.1 +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.49
retrieving revision 1.49.2.1
diff -u -r1.49 -r1.49.2.1
--- StructureImpl.java 9 Aug 2004 12:05:57 -0000 1.49
+++ StructureImpl.java 18 Aug 2004 08:37:24 -0000 1.49.2.1
@@ -428,7 +428,7 @@
// if the object already exists map it anyway into
// the node hierarchy, to prevent loose of nodes
// during start up
- if (!parentObject.hasChild(courObject)) {
+ if (parentObject != null && !parentObject.hasChild(courObject)) {
parentObject.addChild(courObject);
store(token, parentObject, true);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
