Author: tdraier
Date: Tue Sep 18 12:21:50 2007
New Revision: 18537
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18537&repname=
=3Djahia
Log:
avoid nullpointer exceptions when using object tree cache ( JAHIA-2290 )
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentCon=
tainerKey.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentCon=
tainerListKey.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentFie=
ldKey.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=3D1853=
7&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 Tue Sep 18 12:21:50 2007
@@ -76,7 +76,7 @@
}
checkCache();
final String entryKey =3D "parent" + toString();
- if (!treeCache.containsKey(entryKey) || !parent.equals(treeCache.g=
et(entryKey))) {
+ if(!parent.equals(treeCache.get(entryKey))) {
treeCache.put(entryKey, parent);
}
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cont=
entContainerListKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ContentContainerListKey.java&rev=3D=
18537&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=
tainerListKey.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentCon=
tainerListKey.java Tue Sep 18 12:21:50 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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cont=
entFieldKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ContentFieldKey.java&rev=3D18537&re=
pname=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/ContentFie=
ldKey.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentFie=
ldKey.java Tue Sep 18 12:21:50 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
