[Yanel-commits] rev 22735 - in public/yanel/trunk/src: core/java/org/wyona/yanel/core/map resources/importsite/src/java/org/wyona/yanel/impl/resources

[josias at wyona.com]

Author: josias
Date: 2007-02-16 16:03:14 +0100 (Fri, 16 Feb 2007)
New Revision: 22735

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmConfiguration.java
   public/yanel/trunk/src/resources/importsite/src/java/org/wyona/yanel/impl/resources/ImportSiteResource.java
Log:
improved error handling when the source realm does not exist.

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmConfiguration.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmConfiguration.java	2007-02-16 14:38:41 UTC (rev 22734)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmConfiguration.java	2007-02-16 15:03:14 UTC (rev 22735)
@@ -318,13 +318,17 @@
         DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
 
         Realm srcRealm = getRealm(srcRealmID);
+        if (srcRealm == null) {
+            throw new Exception("cannot create realm '" + destRealmID + "': source realm '" + 
+                    srcRealmID + "' does not exist.");
+        }
         String srcConfigSrc = srcRealm.getConfigFile().getAbsolutePath();
         
         File realmConfigFile = resolveFile(new File(srcConfigSrc), realmsConfigFile);
         Configuration realmConfig = builder.buildFromFile(realmConfigFile);
         Configuration srcRootConfig = realmConfig.getChild("root-dir", false);
         if (srcRootConfig == null) {
-            throw new Exception("cannot copy realm " + srcRealmID + " no root dir specified in config file");
+            throw new Exception("cannot copy realm '" + srcRealmID + "' no root dir specified in config file");
         }
         File srcRootDir = new File(srcRootConfig.getValue());
         if (!srcRootDir.isAbsolute()) {

Modified: public/yanel/trunk/src/resources/importsite/src/java/org/wyona/yanel/impl/resources/ImportSiteResource.java
===================================================================
--- public/yanel/trunk/src/resources/importsite/src/java/org/wyona/yanel/impl/resources/ImportSiteResource.java	2007-02-16 14:38:41 UTC (rev 22734)
+++ public/yanel/trunk/src/resources/importsite/src/java/org/wyona/yanel/impl/resources/ImportSiteResource.java	2007-02-16 15:03:14 UTC (rev 22735)
@@ -172,6 +172,7 @@
             
         } catch (Exception e) {
             log.error(e.getMessage(), e);
+            throw e;
         }
         
         defaultView.setMimeType("application/xhtml+xml");