Author: xlawrence
Date: Fri Nov 9 15:11:16 2007
New Revision: 19110
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19110&repname=
=3Djahia
Log:
commit VOD-50 patch
Modified:
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/content=
/ContentContainerKey.java
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/content=
/ContentContainerListKey.java
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/content=
/ContentFieldKey.java
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/c=
ontent/ContentContainerKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/java/org/jahia/content/ContentContainerKey.ja=
va&rev=3D19110&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-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/content=
/ContentContainerKey.java (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/content=
/ContentContainerKey.java Fri Nov 9 15:11:16 2007
@@ -51,8 +51,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: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/c=
ontent/ContentContainerListKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/java/org/jahia/content/ContentContainerListKe=
y.java&rev=3D19110&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-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/content=
/ContentContainerListKey.java (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/content=
/ContentContainerListKey.java Fri Nov 9 15:11:16 2007
@@ -52,8 +52,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-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/c=
ontent/ContentFieldKey.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/java/org/jahia/content/ContentFieldKey.java&r=
ev=3D19110&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-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/content=
/ContentFieldKey.java (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/content=
/ContentFieldKey.java Fri Nov 9 15:11:16 2007
@@ -61,9 +61,10 @@
=
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);
+ final String entryKey =3D "parent" + toString(); =
+ 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
