You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@apache.org on 2005/08/08 14:53:43 UTC
svn commit: r230795 -
/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListBuilder.java
Author: giacomo
Date: Mon Aug 8 05:53:41 2005
New Revision: 230795
URL: http://svn.apache.org/viewcvs?rev=230795&view=rev
Log:
fixed NPE
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListBuilder.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListBuilder.java?rev=230795&r1=230794&r2=230795&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListBuilder.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListBuilder.java Mon Aug 8 05:53:41 2005
@@ -61,7 +61,13 @@
String listPath = DomHelper.getAttribute(selectionListElement, "list-path");
String valuePath = DomHelper.getAttribute(selectionListElement, "value-path");
Map nspfx = DomHelper.getInheritedNSDeclarations(selectionListElement);
- String i18nPfx = (String)nspfx.get( Constants.I18N_NS );
+ String i18nPfx = Constants.I18N_PREFIX;
+ if (nspfx != null) {
+ i18nPfx = (String)nspfx.get( Constants.I18N_NS );
+ if (i18nPfx == null ) {
+ i18nPfx = Constants.I18N_PREFIX;
+ }
+ }
String labelPath = DomHelper.getAttribute(selectionListElement, "label-path", null);
boolean labelIsI18nKey = false;
if( labelPath == null )