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/04/17 16:13:23 UTC
svn commit: r529619 -
/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
Author: andreas
Date: Tue Apr 17 07:13:22 2007
New Revision: 529619
URL: http://svn.apache.org/viewvc?view=rev&rev=529619
Log:
Don't try to handle non-existent samples. This fixes bug 42145. Thanks to Michael Ralston for the patch.
Modified:
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java?view=diff&rev=529619&r1=529618&r2=529619
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java Tue Apr 17 07:13:22 2007
@@ -323,16 +323,18 @@
addErrorMessage("The resource type [" + resourceType.getName()
+ "] doesn't provide any samples!");
}
- setParameter(SAMPLES, samples);
- String presetSample = getParameterAsString(SAMPLE);
- if (presetSample == null) {
- setParameter(SAMPLE, samples[0]);
- } else {
- List sampleList = Arrays.asList(samples);
- if (!sampleList.contains(presetSample)) {
- getLogger().warn(
- "Sample [" + presetSample + "] not defined, using default sample.");
+ else {
+ setParameter(SAMPLES, samples);
+ String presetSample = getParameterAsString(SAMPLE);
+ if (presetSample == null) {
setParameter(SAMPLE, samples[0]);
+ } else {
+ List sampleList = Arrays.asList(samples);
+ if (!sampleList.contains(presetSample)) {
+ getLogger().warn(
+ "Sample [" + presetSample + "] not defined, using default sample.");
+ setParameter(SAMPLE, samples[0]);
+ }
}
}
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org