Author: skarpenko Date: 2009-09-17 07:15:56 -0400 (Thu, 17 Sep 2009) New Revision: 177 Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java Log: JCR-149: LinkedWorkspaceStorageCacheImpl fix Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java =================================================================== --- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java 2009-09-15 15:16:36 UTC (rev 176) +++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java 2009-09-17 11:15:56 UTC (rev 177) @@ -94,7 +94,7 @@ * @throws ValueFormatException * if the value can not be represented as a <code>String</code> or if the value is * <code>null</code>. - * @throws RepositoryException + * @throws RepositoryException * if another error occurs. */ protected String getInternalString() throws ValueFormatException, RepositoryException Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java =================================================================== --- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2009-09-15 15:16:36 UTC (rev 176) +++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2009-09-17 11:15:56 UTC (rev 177) @@ -1728,8 +1728,11 @@ ItemData parent = get(item.getParentIdentifier()); // delete parent remove(parent); + + // delete parent containing child nodes list + nodesCache.remove(parent.getParentIdentifier()); + // traverse itemCache - Iterator<CacheValue> cacheIterator = cache.values().iterator(); while (cacheIterator.hasNext()) { Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java =================================================================== --- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2009-09-15 15:16:36 UTC (rev 176) +++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2009-09-17 11:15:56 UTC (rev 177) @@ -1,18 +1,20 @@ /* - * Copyright (C) 2003-2007 eXo Platform SAS. + * Copyright (C) 2009 eXo Platform SAS. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License - * as published by the Free Software Foundation; either version 3 - * of the License, or (at your option) any later version. + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see<http://www.gnu.org/licenses/>;. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.exoplatform.services.jcr.impl.storage.jdbc; Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java =================================================================== --- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java 2009-09-15 15:16:36 UTC (rev 176) +++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java 2009-09-17 11:15:56 UTC (rev 177) @@ -1,18 +1,20 @@ /* - * Copyright (C) 2003-2007 eXo Platform SAS. + * Copyright (C) 2009 eXo Platform SAS. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License - * as published by the Free Software Foundation; either version 3 - * of the License, or (at your option) any later version. + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see<http://www.gnu.org/licenses/>;. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.exoplatform.services.jcr.impl.storage.jdbc.db; Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java =================================================================== --- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2009-09-15 15:16:36 UTC (rev 176) +++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2009-09-17 11:15:56 UTC (rev 177) @@ -1,18 +1,20 @@ /* - * Copyright (C) 2003-2007 eXo Platform SAS. + * Copyright (C) 2009 eXo Platform SAS. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License - * as published by the Free Software Foundation; either version 3 - * of the License, or (at your option) any later version. + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see<http://www.gnu.org/licenses/>;. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.exoplatform.services.jcr.impl.storage.jdbc.db;