Author: ningjiang Date: Fri Feb 11 11:00:25 2011 New Revision: 1069744 URL: http://svn.apache.org/viewvc?rev=1069744&view=rev Log: Merged revisions 1069739 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................ r1069739 | ningjiang | 2011-02-11 18:49:11 +0800 (Fri, 11 Feb 2011) | 9 lines Merged revisions 1069720 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1069720 | ningjiang | 2011-02-11 17:37:33 +0800 (Fri, 11 Feb 2011) | 1 line CXF-3327 PhaseInterceptorChain should warn user if the interceptor phase can't be found ........ ................ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 11 11:00:25 2011 @@ -1,2 +1,2 @@ -/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819,1062789,1069254 -/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792,1059815,1062778,1069249 +/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819,1062789,1069254,1069739 +/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792,1059815,1062778,1069249,1069720 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=1069744&r1=1069743&r2=1069744&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java (original) +++ cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Fri Feb 11 11:00:25 2011 @@ -195,7 +195,7 @@ public class PhaseInterceptorChain imple Integer phase = nameMap.get(phaseName); if (phase == null) { - LOG.fine("Skipping interceptor " + i.getClass().getName() + LOG.warning("Skipping interceptor " + i.getClass().getName() + ((phaseName == null) ? ": Phase declaration is missing." : ": Phase " + phaseName + " specified does not exist.")); } else {
