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 2006/11/15 17:19:42 UTC
svn commit: r475296 - in
/lenya/trunk/src/impl/java/org/apache/lenya/cms/publication:
PublicationImpl.java PublicationManagerImpl.java
Author: andreas
Date: Wed Nov 15 08:19:42 2006
New Revision: 475296
URL: http://svn.apache.org/viewvc?view=rev&rev=475296
Log:
Don't throw NPE if no parent pub exists
Modified:
lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationImpl.java
lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java
Modified: lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationImpl.java?view=diff&rev=475296&r1=475295&r2=475296
==============================================================================
--- lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationImpl.java (original)
+++ lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationImpl.java Wed Nov 15 08:19:42 2006
@@ -146,7 +146,7 @@
public String getWorkflowSchema(ResourceType resourceType) {
String schema = this.delegate.getWorkflowSchema(resourceType);
- if (schema == null) {
+ if (schema == null && getTemplateIds().length > 0) {
String templateId = getFirstTemplateId();
try {
Publication template = getFactory().getPublication(templateId);
Modified: lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java?view=diff&rev=475296&r1=475295&r2=475296
==============================================================================
--- lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java (original)
+++ lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationManagerImpl.java Wed Nov 15 08:19:42 2006
@@ -37,6 +37,7 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.SourceUtil;
+import org.apache.lenya.util.Assert;
/**
* Factory for creating publication objects.
@@ -54,7 +55,7 @@
public synchronized Publication getPublication(DocumentFactory factory, String id) throws PublicationException {
- assert id != null;
+ Assert.notNull("publication ID", id);
if (id.indexOf("/") != -1) {
throw new PublicationException("The publication ID [" + id + "] must not contain a slash!");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org