svn commit: r776374 - /openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidatingLifecycleEventManager.java

[dwoods]

Author: dwoods
Date: Tue May 19 16:10:06 2009
New Revision: 776374

URL: http://svn.apache.org/viewvc?rev=776374&view=rev
Log:
OPENJPA-1068 has listeners should be logical ORs instead of ANDs

Modified:
    
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidatingLifecycleEventManager.java

Modified: 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidatingLifecycleEventManager.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidatingLifecycleEventManager.java?rev=776374&r1=776373&r2=776374&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidatingLifecycleEventManager.java
 (original)
+++ 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidatingLifecycleEventManager.java
 Tue May 19 16:10:06 2009
@@ -48,7 +48,7 @@
         if (_validator == null) {            
             return super.hasUpdateListeners(source, meta);
         }
-        return _validator.validating(source, LifecycleEvent.BEFORE_PERSIST) &&
+        return _validator.validating(source, LifecycleEvent.BEFORE_PERSIST) ||
             super.hasUpdateListeners(source, meta);
     }
 
@@ -57,7 +57,7 @@
         if (_validator == null) {            
             return super.hasPersistListeners(source, meta);
         }
-        return _validator.validating(source, LifecycleEvent.BEFORE_UPDATE) &&
+        return _validator.validating(source, LifecycleEvent.BEFORE_UPDATE) ||
             super.hasPersistListeners(source, meta);        
     }
 
@@ -66,7 +66,7 @@
         if (_validator == null) {            
             return super.hasDeleteListeners(source, meta);
         }
-        return _validator.validating(source, LifecycleEvent.BEFORE_DELETE) &&
+        return _validator.validating(source, LifecycleEvent.BEFORE_DELETE) ||
             super.hasDeleteListeners(source, meta);
     }