You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/10/11 22:00:18 UTC
svn commit: r1021488 - in /openjpa/trunk:
openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/
Author: dwoods
Date: Mon Oct 11 20:00:17 2010
New Revision: 1021488
URL: http://svn.apache.org/viewvc?rev=1021488&view=rev
Log:
OPENJPA-1830 Deserialization of EMF causes openjpa.connectionPassword to be overwritten with Value.INVISIBLE
Modified:
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java?rev=1021488&r1=1021487&r2=1021488&view=diff
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java Mon Oct 11 20:00:17 2010
@@ -585,9 +585,7 @@ public class ConfigurationImpl
*
* @param storeDefaults
* whether or not to retrieve a property if its value is the
- * default value. This parameter is irrelevant if getAll is true.
- * @param getAll
- * whether or not to get all of the properties
+ * default value.
* @return
*/
public Map toProperties(boolean storeDefaults) {
@@ -606,10 +604,11 @@ public class ConfigurationImpl
// with default values, add values to properties
if (_props == null || storeDefaults) {
String str;
- for (Value val : _vals) {
+ for (Value val : _vals) {
+ // NOTE: Following was removed to hide Value.INVISIBLE properties, like connectionPassword
// if key in existing properties, we already know value is up to date
-// if (_props != null && Configurations.containsProperty(val, _props) && val.isVisible())
-// continue;
+ //if (_props != null && Configurations.containsProperty(val, _props) && val.isVisible())
+ // continue;
str = val.getString();
if ((str != null && (storeDefaults || !str.equals(val.getDefault()))))
setValue(clone, val);
@@ -651,7 +650,9 @@ public class ConfigurationImpl
if (o == null)
continue;
if (o instanceof String) {
- if (!StringUtils.equals((String) o, val.getString()))
+ // OPENJPA-1830 Do not overwrite existing string values with "******"
+ if ((!StringUtils.equals((String) o, val.getString())) &&
+ (!StringUtils.equals((String) o, Value.INVISIBLE)))
val.setString((String) o);
} else {
ser &= o instanceof Serializable;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java?rev=1021488&r1=1021487&r2=1021488&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java Mon Oct 11 20:00:17 2010
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.Set;
import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import junit.framework.TestCase;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java?rev=1021488&r1=1021487&r2=1021488&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java Mon Oct 11 20:00:17 2010
@@ -22,10 +22,7 @@ import java.io.*;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-
import junit.textui.TestRunner;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
import org.apache.openjpa.persistence.test.SingleEMFTestCase;
/**
@@ -36,7 +33,7 @@ import org.apache.openjpa.persistence.te
public class TestSerializedFactory extends SingleEMFTestCase {
public void setUp() {
- setUp(AllFieldTypes.class);
+ setUp(AllFieldTypes.class, CLEAR_TABLES);
}
/**