You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cayenne.apache.org by aa...@apache.org on 2008/08/23 15:54:20 UTC

svn commit: r688324 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/ConfigSaver.java

Author: aadamchik
Date: Sat Aug 23 06:54:20 2008
New Revision: 688324

URL: http://svn.apache.org/viewvc?rev=688324&view=rev
Log:
adding password NPE check that prevents project save errors on invalid modeler inputs

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/ConfigSaver.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/ConfigSaver.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/ConfigSaver.java?rev=688324&r1=688323&r2=688324&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/ConfigSaver.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/ConfigSaver.java Sat Aug 23 06:54:20 2008
@@ -195,7 +195,7 @@
 
         if (info.getPasswordLocation().equals(DataSourceInfo.PASSWORD_LOCATION_MODEL)) {
             PasswordEncoding encoder = info.getPasswordEncoder();
-            if (encoder != null) {
+            if (encoder != null && info.getPassword() != null) {
                 pw.print(attribute("password", encoder.encodePassword(
                         info.getPassword(),
                         info.getPasswordEncoderKey())));