svn commit: r1540480 - /felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java

[jawi]

Author: jawi
Date: Sun Nov 10 14:48:48 2013
New Revision: 1540480

URL: http://svn.apache.org/r1540480
Log:
FELIX-4307: only log something when a real context ID is given.

Modified:
    
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java

Modified: 
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java?rev=1540480&r1=1540479&r2=1540480&view=diff
==============================================================================
--- 
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java
 (original)
+++ 
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/internal/manager/HttpContextManager.java
 Sun Nov 10 14:48:48 2013
@@ -96,7 +96,6 @@ public final class HttpContextManager
         // no context yet, put the mapping on hold
         if (holder == null)
         {
-
             // care for default context if no context ID
             if (ExtenderManager.isEmpty(contextId))
             {
@@ -111,13 +110,22 @@ public final class HttpContextManager
                 orphaned = new HashSet<AbstractMapping>();
                 this.orphanMappings.put(contextId, orphaned);
             }
-            SystemLogger.debug("Holding off mapping with unregistered context 
with id [" + contextId + "]");
+            if (contextId != null)
+            {
+                // Only log something when an actual context ID is used. 
Should solve FELIX-4307...
+                SystemLogger.debug("Holding off mapping with unregistered 
context with id [" + contextId + "]");
+            }
             orphaned.add(mapping);
             return null;
         }
 
         // otherwise use the context
-        SystemLogger.debug("Reusing context with id [" + contextId + "]");
+        if (contextId != null)
+        {
+            // Only log something when an actual context ID is used. Should 
solve FELIX-4307...
+            SystemLogger.debug("Reusing context with id [" + contextId + "]");
+        }
+
         holder.addMapping(mapping);
         return holder.getContext();
     }