From 5daf0d734f50dc2156bfe7da08e3bee5492a5e03 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sat, 11 Aug 2001 04:03:25 +0000
Subject: [PATCH] Throw an instantiation exception rather than returning null
 if there's an error while creating a place manager.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@227 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../crowd/server/PlaceRegistry.java           | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/java/com/threerings/crowd/server/PlaceRegistry.java b/src/java/com/threerings/crowd/server/PlaceRegistry.java
index 2964f73d1..57f69c257 100644
--- a/src/java/com/threerings/crowd/server/PlaceRegistry.java
+++ b/src/java/com/threerings/crowd/server/PlaceRegistry.java
@@ -1,5 +1,5 @@
 //
-// $Id: PlaceRegistry.java,v 1.5 2001/08/02 01:48:08 mdb Exp $
+// $Id: PlaceRegistry.java,v 1.6 2001/08/11 04:03:25 mdb Exp $
 
 package com.threerings.cocktail.party.server;
 
@@ -43,32 +43,33 @@ public class PlaceRegistry implements Subscriber
      * place object or null if an error occurred creating the place or
      * place manager.
      *
+     * @exception InstantiationException thrown if an error occurs trying
+     * to instantiate and initialize the place manager.
+     *
      * @see PlaceConfig#PLACEOBJ_CLASS
      * @see PlaceConfig#PLACEMGR_CLASS
      */
     public PlaceManager createPlace (Properties config)
+        throws InstantiationException
     {
         String pobjcl = config.getProperty(PlaceConfig.PLACEOBJ_CLASS);
         if (pobjcl == null) {
-            Log.warning("No place object classname specified in " +
-                        "place config [config=" + config + "].");
-            return null;
+            throw new InstantiationException(
+                "No place object classname specified in place config.");
         }
 
         String pmgrcl = config.getProperty(PlaceConfig.PLACEMGR_CLASS);
         if (pobjcl == null) {
-            Log.warning("No place manager classname specified in " +
-                        "place config [config=" + config + "].");
-            return null;
+            throw new InstantiationException(
+                "No place manager classname specified in place config.");
         }
 
         try {
             return createPlace(Class.forName(pobjcl),
                                Class.forName(pmgrcl), config);
         } catch (Exception e) {
-            Log.warning("Unable to instantiate place object or " +
-                        "manager class [error=" + e + "].");
-            return null;
+            throw new InstantiationException(
+                "Error instantiating class: " + e);
         }
     }
 
@@ -85,12 +86,16 @@ public class PlaceRegistry implements Subscriber
      *
      * @return a reference to the place manager that will manage the new
      * place object.
+     *
+     * @exception InstantiationException thrown if an error occurs trying
+     * to instantiate and initialize the place manager.
      */
     public PlaceManager createPlace (Class pobjClass, Class pmgrClass,
                                      Properties config)
+        throws InstantiationException
     {
-        // create a place manager for this place
         try {
+            // create a place manager for this place
             PlaceManager pmgr = (PlaceManager)pmgrClass.newInstance();
             // let the pmgr know about us
             pmgr.init(this, config);
@@ -103,12 +108,9 @@ public class PlaceRegistry implements Subscriber
 
             return pmgr;
 
-        } catch (Exception e) {
-            Log.warning("Error creating place " +
-                        "[pobjc=" + pobjClass.getName() +
-                        ", pmgrc=" + pmgrClass.getName() +
-                        ", error=" + e + "].");
-            return null;
+        } catch (IllegalAccessException iae) {
+            throw new InstantiationException(
+                "Error instantiating place manager: " + iae);
         }
     }