Author: xlawrence
Date: Mon Sep 17 17:16:55 2007
New Revision: 18519
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18519&repname=
=3Djahia
Log:
resolve issue http://www.jahia.net/jira/browse/JAHIA-2285: Sp3: Publish All=
site: NPE: ContentContainerKey.setParent(ContentContainerKey.java:76)
Avoid NPE if cache entry is null
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentCon=
tainerKey.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cont=
entContainerKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ContentContainerKey.java&rev=3D1851=
9&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentCon=
tainerKey.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentCon=
tainerKey.java Mon Sep 17 17:16:55 2007
@@ -71,10 +71,14 @@
}
=
void setParent(ContentObjectKey parent) {
+ if (parent =3D=3D null) {
+ throw new IllegalArgumentException("parent cannot be null");
+ }
checkCache();
final String entryKey =3D "parent" + toString();
- if(!treeCache.containsKey(entryKey) || !treeCache.get(entryKey).eq=
uals(parent))
- treeCache.put(entryKey, parent);
+ if (!treeCache.containsKey(entryKey) || !parent.equals(treeCache.g=
et(entryKey))) {
+ treeCache.put(entryKey, parent);
+ }
}
=
public ContentObjectKey getParent(EntryLoadRequest request) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
