Index: resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/ResteasyDeployment.java
===================================================================
--- resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/ResteasyDeployment.java	(revision 945)
+++ resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/ResteasyDeployment.java	(working copy)
@@ -59,13 +59,14 @@
 
    public void start()
    {
+      
+      providerFactory = ResteasyProviderFactory.getInstance();
       if (providerFactory == null) providerFactory = new ResteasyProviderFactory();
       if (deploymentSensitiveFactoryEnabled)
       {
-         ResteasyProviderFactory defaultInstance = ResteasyProviderFactory.getInstance();
-         if (!(defaultInstance instanceof ThreadLocalResteasyProviderFactory))
+         if (!(providerFactory instanceof ThreadLocalResteasyProviderFactory))
          {
-            ResteasyProviderFactory.setInstance(new ThreadLocalResteasyProviderFactory(defaultInstance));
+            ResteasyProviderFactory.setInstance(new ThreadLocalResteasyProviderFactory(providerFactory));
          }
       }
       else