[seam-commits] Seam SVN: r10439 - in trunk/src/main/org/jboss/seam: intercept and 1 other directory.
Author: norman.richards(a)jboss.com
Date: 2009-04-17 18:40:30 -0400 (Fri, 17 Apr 2009)
New Revision: 10439
Modified:
trunk/src/main/org/jboss/seam/intercept/RootInterceptor.java
trunk/src/main/org/jboss/seam/pages-2.1.xsd
Log:
JBSEAM-4120
Modified: trunk/src/main/org/jboss/seam/intercept/RootInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/seam/intercept/RootInterceptor.java 2009-04-17 21:33:42 UTC
(rev 10438)
+++ trunk/src/main/org/jboss/seam/intercept/RootInterceptor.java 2009-04-17 22:40:30 UTC
(rev 10439)
@@ -21,7 +21,10 @@
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.core.Mutable;
import org.jboss.seam.util.EJB;
+import org.jboss.seam.util.Reflections;
+import com.sun.tools.javac.jvm.Target;
+
/**
* Abstract superclass of all controller interceptors
*
@@ -198,10 +201,28 @@
private boolean isProcessInterceptors(Method method, Object bean)
{
- return isSeamComponent &&
+ boolean res = isSeamComponent &&
getComponent().isInterceptionEnabled() &&
!isBypassed(method) &&
!isClearDirtyMethod(method, bean);
+
+ if (componentName.equals("hotelSearch") && method !=null) {
+ System.out.println("*********** BYPASS?[" + res + "] " +
componentName + ":" + method);
+ System.out.println("-" +
method.isAnnotationPresent(BypassInterceptors.class));
+ if (method.getName().equals("hashCode")) {
+
+ try {
+ System.out.println("*A " +
bean.getClass().getMethod("hashCode"));
+
+ System.out.println("*B " +
bean.getClass().getDeclaredMethod("hashCode"));
+ } catch (Exception e) {}
+
+ return false;
+ }
+
+ }
+
+ return res;
}
private boolean isBypassed(Method method)
Modified: trunk/src/main/org/jboss/seam/pages-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/pages-2.1.xsd 2009-04-17 21:33:42 UTC (rev 10438)
+++ trunk/src/main/org/jboss/seam/pages-2.1.xsd 2009-04-17 22:40:30 UTC (rev 10439)
@@ -623,7 +623,7 @@
<xs:simpleType name="method-expression">
<xs:restriction base="xs:token">
- <xs:pattern value="#\{.+\..+\}"/>
+ <xs:pattern value="#\{.*\}"/>
</xs:restriction>
</xs:simpleType>