[Yanel-commits] rev 29317 - public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources

[josias at wyona.com]

Author: josias
Date: 2007-11-28 15:22:34 +0100 (Wed, 28 Nov 2007)
New Revision: 29317

Modified:
   public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java
Log:
handle the case where configuration is null (this happens for resources which still use rti instead of rc)

Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java	2007-11-28 14:17:54 UTC (rev 29316)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java	2007-11-28 14:22:34 UTC (rev 29317)
@@ -90,8 +90,8 @@
         try {
             this.viewDescriptors = new HashMap();
             // reads views from configuration:
-            Document customConfigDoc = getConfiguration().getCustomConfiguration();
-            if (customConfigDoc != null) {
+            if (getConfiguration() != null && getConfiguration().getCustomConfiguration() != null) {
+                Document customConfigDoc = getConfiguration().getCustomConfiguration();
                 Configuration config = ConfigurationUtil.toConfiguration(customConfigDoc.getDocumentElement());
                 Configuration viewsConfig = config.getChild("views");
                 Configuration[] viewConfigs = viewsConfig.getChildren("view");