You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2009/07/07 18:58:08 UTC
svn commit: r791908 -
/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
Author: mikedd
Date: Tue Jul 7 16:58:08 2009
New Revision: 791908
URL: http://svn.apache.org/viewvc?rev=791908&view=rev
Log:
Quick formatting fix (add braces)
modified: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java?rev=791908&r1=791907&r2=791908&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java Tue Jul 7 16:58:08 2009
@@ -1490,13 +1490,16 @@
// if one primary key column use it for target; if multiple joins
// look for a foreign column with same name as local column
PrimaryKey pk = foreign.getPrimaryKey();
- if (joins.length == 1 && pk != null && pk.getColumns().length == 1)
+ if (joins.length == 1 && pk != null && pk.getColumns().length == 1) {
targetName = pk.getColumns()[0].getName();
- else if (foreign.getColumn(name) != null)
+ }
+ else if (foreign.getColumn(name) != null) {
targetName = name;
- else
+ }
+ else {
throw new MetaDataException(_loc.get(prefix
+ "-no-fkcol-target-adapt", context, name));
+ }
}
// find the target column, and create template for local column based