You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/05/02 08:31:43 UTC
svn commit: r534329 - in
/lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository:
SourceNode.java SourceWrapper.java
Author: andreas
Date: Tue May 1 23:31:42 2007
New Revision: 534329
URL: http://svn.apache.org/viewvc?view=rev&rev=534329
Log:
Don't reload data for deleted source nodes
Modified:
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceWrapper.java
Modified: lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java?view=diff&rev=534329&r1=534328&r2=534329
==============================================================================
--- lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java (original)
+++ lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java Tue May 1 23:31:42 2007
@@ -421,6 +421,8 @@
}
public void delete() throws RepositoryException {
+ this.contentSource.delete();
+ this.metaSource.delete();
registerRemoved();
}
Modified: lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceWrapper.java?view=diff&rev=534329&r1=534328&r2=534329
==============================================================================
--- lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceWrapper.java (original)
+++ lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceWrapper.java Tue May 1 23:31:42 2007
@@ -188,6 +188,12 @@
loadData();
return this.data != null;
}
+
+ private boolean deleted;
+
+ protected void delete() {
+ this.deleted = true;
+ }
/**
* Loads the data from the real source.
@@ -196,7 +202,7 @@
*/
protected synchronized void loadData() throws RepositoryException {
- if (this.data != null) {
+ if (this.deleted || this.data != null) {
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org