From a961db35dfed0bfa8fc9a9294d5a96e7a6b5b275 Mon Sep 17 00:00:00 2001
From: Bill Burke <bburke@redhat.com>
Date: Tue, 8 Apr 2014 05:32:05 -0400
Subject: [PATCH] merge

---
 .../core/interception/JaxrsInterceptorRegistry.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/interception/JaxrsInterceptorRegistry.java b/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/interception/JaxrsInterceptorRegistry.java
index 21fd60ed83d..9c7335bd68f 100755
--- a/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/interception/JaxrsInterceptorRegistry.java
+++ b/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/interception/JaxrsInterceptorRegistry.java
@@ -420,7 +420,7 @@ protected void sort(List<Match> matches)
       Collections.sort(matches, new AscendingPrecedenceComparator());
    }
 
-   public void register(InterceptorFactory factory)
+   public synchronized void register(InterceptorFactory factory)
    {
       interceptors.add(factory);
       cachedPreMatch = null;
@@ -430,24 +430,24 @@ public void register(InterceptorFactory factory)
       }
    }
 
-   public void registerClass(Class<? extends T> declaring)
+   public synchronized void registerClass(Class<? extends T> declaring)
    {
       register(new OnDemandInterceptorFactory(declaring));
    }
 
-   public void registerClass(Class<? extends T> declaring, int priority)
+   public synchronized void registerClass(Class<? extends T> declaring, int priority)
    {
       OnDemandInterceptorFactory factory = new OnDemandInterceptorFactory(declaring);
       factory.setOrder(priority);
       register(factory);
    }
 
-   public void registerSingleton(T interceptor)
+   public synchronized void registerSingleton(T interceptor)
    {
       register(new SingletonInterceptorFactory(interceptor.getClass(), interceptor));
    }
 
-   public void registerSingleton(T interceptor, int priority)
+   public synchronized void registerSingleton(T interceptor, int priority)
    {
       SingletonInterceptorFactory factory = new SingletonInterceptorFactory(interceptor.getClass(), interceptor);
       factory.setOrder(priority);