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

Author: niclas
Date: Mon Aug  2 20:25:46 2004
New Revision: 35616

Modified:
   avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HttpContextImpl.java
Log:
NPE problem if no UserRealm is declared.

Modified: avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HttpContextImpl.java
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HttpContextImpl.java	(original)
+++ avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HttpContextImpl.java	Mon Aug  2 20:25:46 2004
@@ -236,9 +236,13 @@
         m_HttpContext.setTempDirectory( m_TemporaryDir );
         m_HttpContext.setRequestLog( m_RequestLog );
         m_HttpContext.setResourceBase( m_ResourceBase.getAbsolutePath() );
-        m_HttpContext.setAuthenticator( m_Authenticator );
-        m_HttpContext.setRealm( m_UserRealm );
-        m_HttpContext.setRealmName( m_UserRealm.getName() ); // Is this necessary?
+        if( m_Authenticator != null )
+            m_HttpContext.setAuthenticator( m_Authenticator );
+        if( m_UserRealm != null )
+        {
+            m_HttpContext.setRealm( m_UserRealm );
+            m_HttpContext.setRealmName( m_UserRealm.getName() ); // Is this necessary?
+        }
         
         if( m_MaxCacheSize > 0 )
             m_HttpContext.setMaxCacheSize( m_MaxCacheSize );