svn commit: r1388227 - in /cxf/branches/2.6.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java

[sergeyb]

Author: sergeyb
Date: Thu Sep 20 21:42:54 2012
New Revision: 1388227

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

........
  r1388226 | sergeyb | 2012-09-20 22:38:31 +0100 (Thu, 20 Sep 2012) | 1 line
  
  [CXF-4500] Evaluating schema locations after providers
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1388226

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

Modified: 
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java?rev=1388227&r1=1388226&r2=1388227&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
 Thu Sep 20 21:42:54 2012
@@ -324,10 +324,10 @@ public class AbstractJAXRSFactoryBean ex
         setDataBindingProvider(factory, ep.getService());
         
         factory.setBus(getBus());
+        factory.initProviders(serviceFactory.getRealClassResourceInfo());
         if (schemaLocations != null) {
             factory.setSchemaLocations(schemaLocations);
         }
-        factory.initProviders(serviceFactory.getRealClassResourceInfo());
         ep.put(ProviderFactory.class.getName(), factory);
         return factory;
     }