svn commit: rev 23215 - in avalon/trunk/planet/facilities/http/impl: . src/main/org/apache/avalon/http/impl

Author: niclas
Date: Sat Jul 24 09:31:08 2004
New Revision: 23215

Modified:
   avalon/trunk/planet/facilities/http/impl/build.xml
   avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/DefaultServer.java
Log:
Fixed some more small bugs.

Modified: avalon/trunk/planet/facilities/http/impl/build.xml
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/build.xml	(original)
+++ avalon/trunk/planet/facilities/http/impl/build.xml	Sat Jul 24 09:31:08 2004
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<project name="avalon-http-impl" default="install" basedir="." 
-    xmlns:x="antlib:org.apache.avalon.tools">
-
-  <property file="build.properties"/>
-  <import file="${project.system}/build/standard.xml"/>
-
-  <target name="build" depends="standard.build">
-    <x:block name="http" embed="MAIN">
-      <x:component name="listener" 
-         class="org.apache.avalon.http.impl.DefaultModelListener"/>
-    </x:block>
-  </target>
-
-</project>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-http-impl" default="install" basedir="." 
+    xmlns:x="antlib:org.apache.avalon.tools">
+
+  <property file="build.properties"/>
+  <import file="${project.system}/build/standard.xml"/>
+
+  <target name="build" depends="standard.build">
+    <x:block name="http" embed="MAIN">
+      <x:component name="model-listener" 
+         class="org.apache.avalon.http.impl.DefaultModelListener"/>
+    </x:block>
+  </target>
+
+</project>
+

Modified: avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/DefaultServer.java
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/DefaultServer.java	(original)
+++ avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/DefaultServer.java	Sat Jul 24 09:31:08 2004
@@ -102,6 +102,11 @@
     private HashMap m_ComponentMap;
      
 
+    public DefaultServer()
+    {
+        m_ComponentMap = new HashMap();
+    }
+    
    //---------------------------------------------------------
    // LogEnabled
    //---------------------------------------------------------
@@ -275,8 +280,10 @@
     public void register( ComponentModel model )
     {
         final String path = model.getPath();
-        final String url = (String) m_ComponentMap.get( path );
-        
+        String url = (String) m_ComponentMap.get( path );
+        if( url == null )
+            url = path;
+            
         getLogger().info( 
           "registering servlet: " 
           + path + " to url: " + url );