svn commit: r618858 - in /incubator/cxf/branches/2.0.x-fixes: ./ api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java

[dkulp]

Author: dkulp
Date: Tue Feb  5 18:46:05 2008
New Revision: 618858

URL: http://svn.apache.org/viewvc?rev=618858&view=rev
Log:
Merged revisions 615451 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r615451 | gmazza | 2008-01-26 08:55:50 -0500 (Sat, 26 Jan 2008) | 1 line
  
  Made missing phase error message more explicit.
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=618858&r1=618857&r2=618858&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
 Tue Feb  5 18:46:05 2008
@@ -160,20 +160,22 @@
     public void add(Interceptor i, boolean force) {
         PhaseInterceptor pi = (PhaseInterceptor)i;
 
-        if (LOG.isLoggable(Level.FINE)) {
-            LOG.fine("Adding interceptor " + i + " to phase " + pi.getPhase());
-        }
-
-        String phaseName = pi.getPhase();
-        
+        String phaseName = pi.getPhase();        
         Integer phase = nameMap.get(phaseName);
+        
         if (phase == null) {
-            LOG.fine("Phase " + phaseName + " does not exist. Skipping handler 
"
-                      + i.getClass().getName());
+            LOG.fine("Skipping interceptor " + i.getClass().getName() 
+                + ((phaseName == null) ? ": Phase declaration is missing." 
+                : ": Phase " + phaseName + " specified does not exist."));
         } else {            
+            if (LOG.isLoggable(Level.FINE)) {
+                LOG.fine("Adding interceptor " + i + " to phase " + phaseName);
+            }
+
             insertInterceptor(phase, pi, force);
         }
     }
+
 
     public synchronized void pause() {
         state = State.PAUSED;