Author: areshetnyak Date: 2011-08-11 11:11:36 -0400 (Thu, 11 Aug 2011) New Revision: 4746 Modified: jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1633/JCR-1633.patch Log: JCR-1633 : Update patch. Modified: jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1633/JCR-1633.patch =================================================================== --- jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1633/JCR-1633.patch 2011-08-11 14:20:57 UTC (rev 4745) +++ jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1633/JCR-1633.patch 2011-08-11 15:11:36 UTC (rev 4746) @@ -1,7 +1,7 @@ -Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java +Index: src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java =================================================================== ---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java (revision 4692) -+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java (working copy) +--- src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java (revision 4711) ++++ src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java (working copy) @@ -28,6 +28,7 @@ import org.exoplatform.services.jcr.datamodel.ItemData; import org.exoplatform.services.jcr.datamodel.ItemType; @@ -27,10 +27,35 @@ if (isSystemDescendant(cdata.getQPath())) return versionDataManager.getItemData(identifier); else -Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java +Index: src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java =================================================================== ---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java (revision 4692) -+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java (working copy) +--- src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java (revision 4711) ++++ src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java (working copy) +@@ -27,6 +27,7 @@ + import org.exoplatform.services.jcr.datamodel.ItemData; + import org.exoplatform.services.jcr.datamodel.ItemType; + import org.exoplatform.services.jcr.datamodel.NodeData; ++import org.exoplatform.services.jcr.datamodel.NullItemData; + import org.exoplatform.services.jcr.datamodel.PropertyData; + import org.exoplatform.services.jcr.datamodel.QPath; + import org.exoplatform.services.jcr.datamodel.QPathEntry; +@@ -916,6 +917,12 @@ + { + if (enabled && item != null) + { ++ ++ if (item instanceof NullItemData) ++ { ++ // skip null values ++ return; ++ } + + writeLock.lock(); + try +Index: src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java +=================================================================== +--- src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java (revision 4711) ++++ src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java (working copy) @@ -30,6 +30,9 @@ import org.exoplatform.services.jcr.datamodel.ItemData; import org.exoplatform.services.jcr.datamodel.ItemType; @@ -261,10 +286,10 @@ { //make relative path -Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java +Index: src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java =================================================================== ---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java (revision 4692) -+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java (working copy) +--- src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java (revision 4711) ++++ src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java (working copy) @@ -23,6 +23,9 @@ import org.exoplatform.services.jcr.datamodel.ItemData; import org.exoplatform.services.jcr.datamodel.ItemType; @@ -373,10 +398,10 @@ } return data; } -Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullPropertyData.java +Index: src/main/java/org/exoplatform/services/jcr/datamodel/NullPropertyData.java =================================================================== ---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullPropertyData.java (revision 0) -+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullPropertyData.java (revision 0) +--- src/main/java/org/exoplatform/services/jcr/datamodel/NullPropertyData.java (revision 0) ++++ src/main/java/org/exoplatform/services/jcr/datamodel/NullPropertyData.java (revision 0) @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2003-2010 eXo Platform SAS. @@ -457,10 +482,10 @@ + } + +} -Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullNodeData.java +Index: src/main/java/org/exoplatform/services/jcr/datamodel/NullNodeData.java =================================================================== ---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullNodeData.java (revision 0) -+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullNodeData.java (revision 0) +--- src/main/java/org/exoplatform/services/jcr/datamodel/NullNodeData.java (revision 0) ++++ src/main/java/org/exoplatform/services/jcr/datamodel/NullNodeData.java (revision 0) @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2010 eXo Platform SAS. @@ -550,10 +575,10 @@ + } + +} -Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullItemData.java +Index: src/main/java/org/exoplatform/services/jcr/datamodel/NullItemData.java =================================================================== ---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullItemData.java (revision 0) -+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/NullItemData.java (revision 0) +--- src/main/java/org/exoplatform/services/jcr/datamodel/NullItemData.java (revision 0) ++++ src/main/java/org/exoplatform/services/jcr/datamodel/NullItemData.java (revision 0) @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2003-2010 eXo Platform SAS.