You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by fa...@apache.org on 2009/06/26 17:44:34 UTC
svn commit: r788746 -
/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java
Author: faywang
Date: Fri Jun 26 15:44:34 2009
New Revision: 788746
URL: http://svn.apache.org/viewvc?rev=788746&view=rev
Log:
OPENJPA-1143: fix compiler error on IBM SDK5
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java?rev=788746&r1=788745&r2=788746&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java Fri Jun 26 15:44:34 2009
@@ -227,7 +227,7 @@
(Members.SingularAttributeImpl<?,?>)((Joins.SingularJoin<?,?>)join).getMember();
JoinType jt = join.getJoinType();
FromImpl<?,?> root = null;
- if (parent instanceof RootImpl<?>) {
+ if (parent instanceof RootImpl) {
members.add(member);
jts.add(jt);
return (FromImpl<?,?>)parent;
@@ -305,8 +305,7 @@
}
RootImpl<?> root = (RootImpl<?>)getRoot();
- RootImpl<?> corrRoot = (RootImpl<?>)root.getCorrelatedPath();
- if (corrRoot != null && root.getJoins() != null) {
+ if (root.getCorrelatedPath() != null && root.getJoins() != null) {
FromImpl<?,?> join = (FromImpl<?,?>) root.getJoins().iterator().next();
return getInnermostCandidate(join);
}