[seam-commits] Seam SVN: r9422 - trunk/src/main/org/jboss/seam.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-10-24 11:20:59 -0400 (Fri, 24 Oct 2008)
New Revision: 9422

Modified:
   trunk/src/main/org/jboss/seam/Component.java
Log:
JBSEAM-3618

Modified: trunk/src/main/org/jboss/seam/Component.java
===================================================================
--- trunk/src/main/org/jboss/seam/Component.java	2008-10-24 12:32:22 UTC (rev 9421)
+++ trunk/src/main/org/jboss/seam/Component.java	2008-10-24 15:20:59 UTC (rev 9422)
@@ -954,35 +954,40 @@
       if ( log.isDebugEnabled() ) log.debug("interceptor stack: " + interceptors);
    }
 
-   public void addInterceptor(Interceptor interceptor)
+   public void addInterceptor(Object interceptorInstance)
    {
       try
       {
-         if (interceptor.isInterceptorEnabled())
-         {
-            if (interceptor.getType()==InterceptorType.SERVER) 
-            {
-               interceptors.add(interceptor);
-            }
-            else 
-            {
-               clientSideInterceptors.add(interceptor);
-            }
-         }
+         addInterceptor(new Interceptor(interceptorInstance, this));
       }
       catch (NoClassDefFoundError e)
       {
-         log.debug("Unable to load interceptor " + interceptor, e);
+         log.debug("Unable to load interceptor " + interceptorInstance.getClass(), e);
       }
       catch (TypeNotPresentException e) 
       {
-         log.debug("Unable to load interceptor " + interceptor, e);
+         log.debug("Unable to load interceptor " + interceptorInstance.getClass(), e);
       }
       catch (Exception e)
       {
-         throw new IllegalArgumentException("Unable to load interceptor " + interceptor, e);
+         throw new IllegalArgumentException("Unable to load interceptor " + interceptorInstance.getClass(), e);
       }
    }
+   
+   public void addInterceptor(Interceptor interceptor)
+   {
+      if (interceptor.isInterceptorEnabled())
+      {
+         if (interceptor.getType()==InterceptorType.SERVER) 
+         {
+            interceptors.add(interceptor);
+         }
+         else 
+         {
+            clientSideInterceptors.add(interceptor);
+         }
+      }
+   }
 
    private List<Interceptor> newSort(List<Interceptor> list)
    {
@@ -1059,7 +1064,7 @@
          {
             throw new IllegalArgumentException("Unable to load interceptor " + interceptorName, e);
          }
-         addInterceptor(new Interceptor(interceptorInstance, this));
+         addInterceptor(interceptorInstance);
          
       }
    }