Author: tdraier
Date: Fri Sep 21 11:37:24 2007
New Revision: 18611
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18611&repname=
=3Djahia
Log:
avoid nullpointer exceptions when using object tree cache ( JAHIA-2290 ) ( =
port 18537 )
Modified:
trunk/core/src/java/org/jahia/content/ContentContainerKey.java
trunk/core/src/java/org/jahia/content/ContentContainerListKey.java
trunk/core/src/java/org/jahia/content/ContentFieldKey.java
Modified: trunk/core/src/java/org/jahia/content/ContentContainerKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/content/ContentContainerKey.java&rev=3D18611&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
--- trunk/core/src/java/org/jahia/content/ContentContainerKey.java (origina=
l)
+++ trunk/core/src/java/org/jahia/content/ContentContainerKey.java Fri Sep =
21 11:37:24 2007
@@ -73,8 +73,9 @@
void setParent(ContentObjectKey parent) {
checkCache();
final String entryKey =3D "parent" + toString();
- if(!treeCache.containsKey(entryKey) || !treeCache.get(entryKey).eq=
uals(parent))
- treeCache.put(entryKey, parent);
+ if(!parent.equals(treeCache.get(entryKey))) {
+ treeCache.put(entryKey, parent);
+ }
}
=
public ContentObjectKey getParent(EntryLoadRequest request) {
Modified: trunk/core/src/java/org/jahia/content/ContentContainerListKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/content/ContentContainerListKey.java&rev=3D18611&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
--- trunk/core/src/java/org/jahia/content/ContentContainerListKey.java (ori=
ginal)
+++ trunk/core/src/java/org/jahia/content/ContentContainerListKey.java Fri =
Sep 21 11:37:24 2007
@@ -74,8 +74,9 @@
void setParent(ContentObjectKey parent) {
checkCache();
final String entryKey =3D "parent" + toString();
- if(!treeCache.containsKey(entryKey) || treeCache.get(entryKey)=3D=
=3Dnull || !treeCache.get(entryKey).equals(parent))
- treeCache.put(entryKey, parent);
+ if(parent !=3D null && !parent.equals(treeCache.get(entryKey))) {
+ treeCache.put(entryKey, parent);
+ }
}
=
public ContentObjectKey getParent(EntryLoadRequest request) {
Modified: trunk/core/src/java/org/jahia/content/ContentFieldKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/content/ContentFieldKey.java&rev=3D18611&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
--- trunk/core/src/java/org/jahia/content/ContentFieldKey.java (original)
+++ trunk/core/src/java/org/jahia/content/ContentFieldKey.java Fri Sep 21 1=
1:37:24 2007
@@ -84,8 +84,9 @@
public void setParent(ContentObjectKey parent) {
checkCache();
final String entryKey =3D "parent" + toString();
- if(!treeCache.containsKey(entryKey) || !treeCache.get(entryKey).eq=
uals(parent))
- treeCache.put(entryKey, parent);
+ if (parent !=3D null && !parent.equals(treeCache.get(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
