cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r760797 - in /cayenne/main/trunk: docs/doc/src/main/resources/RELEASE-NOTES.txt framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
Date Wed, 01 Apr 2009 07:14:40 GMT
Author: aadamchik
Date: Wed Apr  1 07:14:39 2009
New Revision: 760797

URL: http://svn.apache.org/viewvc?rev=760797&view=rev
Log:
CAY-1170 cdbgen task fails due to NPE when instantiating TypesHandler

patch by Dima Loiko. Issue fixed

Modified:
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java

Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=760797&r1=760796&r2=760797&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Wed Apr  1 07:14:39 2009
@@ -42,6 +42,7 @@
 CAY-1157 Modeler: Concurrent mod exception on removing DbRelationship
 CAY-1160 Default delete rule is not used when migrating schema (to model)
 CAY-1166 Type checking in the modeler
+CAY-1170 cdbgen task fails due to NPE when instantiating TypesHandler
 CAY-1176 missing classes in ROP cayenne-client render nested contexts unusable
 CAY-1180 Model marked as dirty when leaving DataMap name field
 CAY-1183 commitToParent() makes object persistence state committed, produces exception when
using object in parent context (ROP)

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java?rev=760797&r1=760796&r2=760797&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
Wed Apr  1 07:14:39 2009
@@ -73,7 +73,10 @@
 
         validateAttributes();
         
+        ClassLoader loader = null;
         try {
+            loader = Thread.currentThread().getContextClassLoader();
+            Thread.currentThread().setContextClassLoader(DbGeneratorTask.class.getClassLoader());
 
             // Load the data map and run the db generator.
             DataMap dataMap = loadDataMap();
@@ -102,6 +105,9 @@
             super.log(message);
             throw new BuildException(message, th);
         }
+        finally{
+            Thread.currentThread().setContextClassLoader(loader);
+        }
     }
 
     /**



Mime
View raw message