You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mp...@apache.org on 2007/04/26 01:13:12 UTC

svn commit: r532524 - in /incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa: meta/MetaDataRepository.java util/MetaDataException.java

Author: mprudhom
Date: Wed Apr 25 16:13:12 2007
New Revision: 532524

URL: http://svn.apache.org/viewvc?view=rev&rev=532524
Log:
Fixed MetaDataException to take a nested Throwable argument (which is the common case) instead of a FailedObject Object argument (which many of the existing constructions of MetaDataException are erronously using with a nested Throwable argument)

Modified:
    incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
    incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/MetaDataException.java

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java?view=diff&rev=532524&r1=532523&r2=532524
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java Wed Apr 25 16:13:12 2007
@@ -961,7 +961,7 @@
         if (!mustExist)
             return null;
         throw new MetaDataException(_loc.get("no-oid-meta", oid,
-            oid.getClass(), _oids), oid);
+            oid.getClass(), _oids)).setFailedObject(oid);
     }
 
     /**

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/MetaDataException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/MetaDataException.java?view=diff&rev=532524&r1=532523&r2=532524
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/MetaDataException.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/MetaDataException.java Wed Apr 25 16:13:12 2007
@@ -43,10 +43,9 @@
         setFatal(true);
     }
 
-    public MetaDataException(Message msg, Object failed) {
-        super(msg);
+    public MetaDataException(Message msg, Throwable nested) {
+        super(msg, nested);
         setFatal(true);
-        setFailedObject(failed);
     }
 
     public int getSubtype() {