svn commit: r476498 - /forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/core/Controller.java

[rgardler]

Author: rgardler
Date: Sat Nov 18 04:17:13 2006
New Revision: 476498

URL: http://svn.apache.org/viewvc?view=rev&rev=476498
Log:
Can't getCLass of a null object (run tests bfore committing)

Modified:
    
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/core/Controller.java

Modified: 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/core/Controller.java
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/core/Controller.java?view=diff&rev=476498&r1=476497&r2=476498
==============================================================================
--- 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/core/Controller.java 
(original)
+++ 
forrest/trunk/whiteboard/forrest2/core/org/apache/forrest/core/Controller.java 
Sat Nov 18 04:17:13 2006
@@ -225,8 +225,7 @@
         */
        public BaseOutputPlugin getOutputPlugin(final URI requestURI) {
                BaseOutputPlugin plugin = null;
-               final String[] names = this.context.getBeanNamesForType(plugin
-                               .getClass());
+               final String[] names = 
this.context.getBeanNamesForType(BaseOutputPlugin.class);
                for (int i = 0; i < names.length; i = i + 1) {
                        plugin = (BaseOutputPlugin) 
this.context.getBean(names[i]);
                        if (plugin.isMatch(requestURI)) {
@@ -258,7 +257,7 @@
                for (int i = 0; i < sourceLocations.size(); i++) {
                        final Location location = sourceLocations.get(i);
                        IReader reader = getReader(location);
-                       results.add(reader.read(this.context, location));
+                       results.add(reader.read(this, location));
                }
                return results;
        }