[jbehave-scm] [954] trunk/jbehave-core/src/java/org/jbehave/container: Added cause to container exceptions.

Mon, 29 Sep 2008 00:27:25 -0700

Title: [954] trunk/jbehave-core/src/java/org/jbehave/container: Added cause to container exceptions.

Diff

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/container/spring/SpringContainerBehaviour.java (953 => 954)

--- trunk/jbehave-core/src/behaviour/org/jbehave/container/spring/SpringContainerBehaviour.java	2008-09-29 06:44:54 UTC (rev 953)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/container/spring/SpringContainerBehaviour.java	2008-09-29 07:27:09 UTC (rev 954)
@@ -37,10 +37,11 @@
         assertNotNull(container.getComponent(AnotherComponent.class));
     }
 
-    //[EMAIL PROTECTED]
+    // @Test
+    // FIXME the SpringContainer(String) contructor - which delegate to this - works!
     public void canGetComponentsWithCustomClassLoader() {
-        Container container = new SpringContainer("org/jbehave/container/spring/components.xml", Thread
-                .currentThread().getContextClassLoader());
+        Container container = new SpringContainer("org/jbehave/container/spring/components.xml", Thread.currentThread()
+                .getContextClassLoader());
         assertNotNull(container.getComponent(AComponent.class));
         assertNotNull(container.getComponent(AnotherComponent.class));
     }

Modified: trunk/jbehave-core/src/java/org/jbehave/container/ComponentNotFoundException.java (953 => 954)

--- trunk/jbehave-core/src/java/org/jbehave/container/ComponentNotFoundException.java	2008-09-29 06:44:54 UTC (rev 953)
+++ trunk/jbehave-core/src/java/org/jbehave/container/ComponentNotFoundException.java	2008-09-29 07:27:09 UTC (rev 954)
@@ -1,5 +1,6 @@
 package org.jbehave.container;
 
+
 /**
  * Thrown when no component is found for a given key or type in the container
  * 
@@ -12,4 +13,8 @@
         super(message);
     }
 
+    public ComponentNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
 }

Modified: trunk/jbehave-core/src/java/org/jbehave/container/InvalidContainerException.java (953 => 954)

--- trunk/jbehave-core/src/java/org/jbehave/container/InvalidContainerException.java	2008-09-29 06:44:54 UTC (rev 953)
+++ trunk/jbehave-core/src/java/org/jbehave/container/InvalidContainerException.java	2008-09-29 07:27:09 UTC (rev 954)
@@ -1,5 +1,6 @@
 package org.jbehave.container;
 
+
 /**
  * Thrown when a container cannot be created
  * 
@@ -12,4 +13,8 @@
         super(message);
     }
 
+    public InvalidContainerException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
 }

Modified: trunk/jbehave-core/src/java/org/jbehave/container/pico/AbstractPicoContainer.java (953 => 954)

--- trunk/jbehave-core/src/java/org/jbehave/container/pico/AbstractPicoContainer.java	2008-09-29 06:44:54 UTC (rev 953)
+++ trunk/jbehave-core/src/java/org/jbehave/container/pico/AbstractPicoContainer.java	2008-09-29 07:27:09 UTC (rev 954)
@@ -46,12 +46,11 @@
             String message = format("No component registered in container of type {0}", type);
             throw new ComponentNotFoundException(message);
         }
-        if (key != null) {
-            T component = null;
+        if (key != null) {            
             // a key has been provided: return the component for that key
             for (ComponentAdapter<T> adapter : adapters) {
                 if (key.equals(adapter.getComponentKey())) {
-                    component = adapter.getComponentInstance(container, type);
+                    T component = adapter.getComponentInstance(container, type);
                     if ( component != null ){
                         return component;
                     }

Modified: trunk/jbehave-core/src/java/org/jbehave/container/spring/SpringContainer.java (953 => 954)

--- trunk/jbehave-core/src/java/org/jbehave/container/spring/SpringContainer.java	2008-09-29 06:44:54 UTC (rev 953)
+++ trunk/jbehave-core/src/java/org/jbehave/container/spring/SpringContainer.java	2008-09-29 07:27:09 UTC (rev 954)
@@ -40,7 +40,7 @@
             return (BeanFactory) reader.getBeanFactory();
         } catch (BeansException e) {
             String message = format("Failed to create container for resource {0}", resource);
-            throw new InvalidContainerException(message);
+            throw new InvalidContainerException(message, e);
         }
     }
 
@@ -50,7 +50,7 @@
             return (T) factory.getBean(type.getName());
         } catch (BeansException e) {
             String message = format("No component registered in container of type {0}", type);
-            throw new ComponentNotFoundException(message);
+            throw new ComponentNotFoundException(message, e);
         }
     }
 
@@ -60,7 +60,7 @@
             return (T) factory.getBean(key.toString());
         } catch (BeansException e) {
             String message = format("No component registered in container of key {0}", key);
-            throw new ComponentNotFoundException(message);
+            throw new ComponentNotFoundException(message, e);
         }
     }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to