Author: cmailleux
Date: Wed Sep 26 11:20:30 2007
New Revision: 18657
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18657&repname=
=3Djahia
Log:
Correctly load field to avoid npe in live
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaF=
ieldSet.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/=
JahiaFieldSet.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/fields/JahiaFieldSet.java&rev=3D18657&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaF=
ieldSet.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaF=
ieldSet.java Wed Sep 26 11:20:30 2007
@@ -420,8 +420,20 @@
* EV 29.12.2000
*/
public boolean checkDeclared(String fieldName) {
- if(Jahia.getThreadParamBean().getOperationMode().equals(Processing=
Context.NORMAL) && ! declaredFields.contains(fieldName))
- declaredFields.add(fieldName);
+ if(Jahia.getThreadParamBean().getOperationMode().equals(Processing=
Context.NORMAL) && ! declaredFields.contains(fieldName)){
+ try {
+ int fieldID =3D ServicesRegistry.getInstance().getJahiaFie=
ldService()
+ .getFieldID(fieldName, Jahia.getThreadPara=
mBean().getPageID());
+ if(fieldID>0) {
+ declaredFields.add(fieldName);
+ JahiaField field =3D ServicesRegistry.getInstance().ge=
tJahiaFieldService().loadField(fieldID, Jahia.getThreadParamBean());
+ fields.put(fieldName,field);
+ }
+ } catch (JahiaException e) {
+ e.printStackTrace();//To change body of catch statement us=
e File | Settings | File Templates.
+ }
+
+ }
return declaredFields.contains(fieldName);
} // end checkDeclared
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
