You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/06/18 21:37:25 UTC
svn commit: r669266 - in /openejb/trunk/openejb3/container/openejb-core/src:
main/java/org/apache/openejb/config/SunConversion.java
test/java/org/apache/openejb/config/SunCmpConversionTest.java
Author: dblevins
Date: Wed Jun 18 12:37:25 2008
New Revision: 669266
URL: http://svn.apache.org/viewvc?rev=669266&view=rev
Log:
Fixed SunCmpConversionTest
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/SunCmpConversionTest.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java?rev=669266&r1=669265&r2=669266&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java Wed Jun 18 12:37:25 2008
@@ -1126,6 +1126,7 @@
}
public boolean hasPkColumnMapping(String column) {
+ if (ids.size() > 1) return false;
for (Id id : ids.values()) {
if (column.equals(id.getColumn().getName())) {
return true;
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/SunCmpConversionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/SunCmpConversionTest.java?rev=669266&r1=669265&r2=669266&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/SunCmpConversionTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/SunCmpConversionTest.java Wed Jun 18 12:37:25 2008
@@ -47,7 +47,7 @@
* @version $Rev$ $Date$
*/
public class SunCmpConversionTest extends TestCase {
- public void _testItests22() throws Exception {
+ public void testItests22() throws Exception {
convert("convert/oej2/cmp/itest-2.2/itest-2.2-");
}