svn commit: r442691 - in /incubator/openjpa/trunk: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/ openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ openjpa-kernel/src/main/java/org/apache/openjpa/kernel/

[aw...@apache.org]

Author: awhite
Date: Tue Sep 12 13:06:29 2006
New Revision: 442691

URL: http://svn.apache.org/viewvc?view=rev&rev=442691
Log:
Fix erroneous change I made yesterday.


Modified:
    incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java
    incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java
    incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyInverseKeyFieldStrategy.java
    incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java

Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java?view=diff&rev=442691&r1=442690&r2=442691
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java Tue Sep 12 13:06:29 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.openjpa.jdbc.conf;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.openjpa.jdbc.meta.MetaDataPlusMappingFactory;
 import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.lib.conf.Configurations;
@@ -89,7 +90,7 @@
         // if no mapping factory set, check for default for this factory
         if (clsName == null || clsName.length() == 0) {
             String def;
-            if (mapping != null) {
+            if (!StringUtils.isEmpty(mapping)) {
                 def = unalias(metaPlugin.alias(metaClsName),
                     _mappedMetaFactoryDefaults, true);
                 if (def != null)

Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java?view=diff&rev=442691&r1=442690&r2=442691
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java Tue Sep 12 13:06:29 2006
@@ -243,8 +243,7 @@
         throws SQLException {
         ForeignKey fk = field.getForeignKey();
         ColumnIO io = field.getColumnIO();
-        if (fk.getDeleteAction() != ForeignKey.ACTION_NONE 
-            || !io.isAnyUpdatable(fk, true))
+        if (!io.isAnyUpdatable(fk, true))
             return;
 
         // null inverse if not already enforced by fk

Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyInverseKeyFieldStrategy.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyInverseKeyFieldStrategy.java?view=diff&rev=442691&r1=442690&r2=442691
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyInverseKeyFieldStrategy.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyInverseKeyFieldStrategy.java Tue Sep 12 13:06:29 2006
@@ -223,8 +223,7 @@
         ValueMapping elem = field.getElementMapping();
         ColumnIO io = elem.getColumnIO();
         ForeignKey fk = elem.getForeignKey();
-        if (fk.getDeleteAction() != ForeignKey.ACTION_NONE
-            || !io.isAnyUpdatable(fk, true)) 
+        if (!io.isAnyUpdatable(fk, true)) 
             return;
 
         // if the fk doesn't enforce it, null any existing inverse columns 

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java?view=diff&rev=442691&r1=442690&r2=442691
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java Tue Sep 12 13:06:29 2006
@@ -17,7 +17,7 @@
 
 /**
  * Lifecycle state.
- *  Represents an embedded instance that is not transactional, but that
+ * Represents an embedded instance that is not transactional, but that
  * allows access to persistent data. This state is reachable only if the
  * retainValues flag of the broker is set.
  *