Author: ppoddar
Date: Wed Feb 11 18:04:23 2009
New Revision: 743431
URL: http://svn.apache.org/viewvc?rev=743431&view=rev
Log:
Bypass callback method clash if two parsers have parsed the identical method
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataParsers.java
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataParsers.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataParsers.java?rev=743431&r1=743430&r2=743431&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataParsers.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataParsers.java
Wed Feb 11 18:04:23 2009
@@ -82,7 +82,8 @@
if (!(lc instanceof MethodLifecycleCallbacks))
continue;
Method exists = ((MethodLifecycleCallbacks)
lc).getCallbackMethod();
- if (!exists.getDeclaringClass().equals(method.getDeclaringClass()))
+ if (!exists.getDeclaringClass().equals(method.getDeclaringClass())
+ || exists.equals(method))
continue;
Localizer.Message msg = _loc.get("multiple-methods-on-callback",
