Author: pnedonosko Date: 2009-11-23 09:29:49 -0500 (Mon, 23 Nov 2009) New Revision: 810 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java Log: EXOJCR-200: impl of getItemData by Id for version manager Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2009-11-23 13:46:17 UTC (rev 809) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2009-11-23 14:29:49 UTC (rev 810) @@ -118,41 +118,41 @@ return super.getItemData(parentData, name); } - // /** - // * {@inheritDoc} - // */ - // public ItemData getItemData(String identifier) throws RepositoryException - // { - // // from cache at first - // ItemData cdata = persistentManager.getCachedItemData(identifier); - // if (cdata != null) - // return super.getItemData(identifier); - // - // if (!this.equals(versionDataManager) && !identifier.equals(Constants.ROOT_UUID)) - // { - // // search in System cache for /jcr:system nodes only - // cdata = versionDataManager.persistentManager.getCachedItemData(identifier); - // if (cdata != null) - // if (isSystemDescendant(cdata.getQPath())) - // return versionDataManager.getItemData(identifier); - // else - // return null; - // } - // - // // then from persistence - // ItemData data = super.getItemData(identifier); - // if (data != null) - // return data; - // else if (!this.equals(versionDataManager)) - // { - // // try from version storage if not the same - // data = versionDataManager.getItemData(identifier); - // if (data != null && isSystemDescendant(data.getQPath())) - // return data; - // } - // return null; - // } + /** + * {@inheritDoc} + */ + public ItemData getItemData(String identifier) throws RepositoryException + { +// // from cache at first +// ItemData cdata = persistentManager.getCachedItemData(identifier); +// if (cdata != null) +// return super.getItemData(identifier); +// +// if (!this.equals(versionDataManager) && !identifier.equals(Constants.ROOT_UUID)) +// { +// // search in System cache for /jcr:system nodes only +// cdata = versionDataManager.persistentManager.getCachedItemData(identifier); +// if (cdata != null) +// if (isSystemDescendant(cdata.getQPath())) +// return versionDataManager.getItemData(identifier); +// else +// return null; +// } + // then from persistence + ItemData data = super.getItemData(identifier); + if (data != null) + return data; + else if (!this.equals(versionDataManager)) + { + // try from version storage if not the same + data = versionDataManager.getItemData(identifier); + if (data != null && isSystemDescendant(data.getQPath())) + return data; + } + return null; + } + public void save(CompositeChangesLog changesLog) throws RepositoryException, InvalidItemStateException {