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 2004/05/03 15:52:46 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/publication PublicationFactory.java
andreas 2004/05/03 06:52:46
Modified: src/java/org/apache/lenya/cms/publication
PublicationFactory.java
Log:
return null if publication does not exist
Revision Changes Path
1.26 +7 -5 cocoon-lenya/src/java/org/apache/lenya/cms/publication/PublicationFactory.java
Index: PublicationFactory.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/publication/PublicationFactory.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- PublicationFactory.java 1 Mar 2004 16:18:16 -0000 1.25
+++ PublicationFactory.java 3 May 2004 13:52:46 -0000 1.26
@@ -86,16 +86,18 @@
assert servletContextPath != null;
String key = generateKey(id, servletContextPath);
- Publication publication;
+ Publication publication = null;
if (keyToPublication.containsKey(key)) {
publication = (Publication) keyToPublication.get(key);
} else {
- publication = new FilePublication(id, servletContextPath);
- keyToPublication.put(key, publication);
+ if (PublicationFactory.existsPublication(id, servletContextPath)) {
+ publication = new FilePublication(id, servletContextPath);
+ keyToPublication.put(key, publication);
+ }
}
- assert publication != null;
+// assert publication != null;
return publication;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org