Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for issue OPENJPA-51. It should also resolve issue OPENJPA-173. 

Change to use BitSet.

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@534647 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David J. Wisneski 2007-05-02 22:53:39 +00:00
parent d5d214c182
commit a044af3287
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
View File

@ -26,6 +26,7 @@ import java.sql.Statement;
import java.sql.Types;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@ -164,7 +165,7 @@ public class SelectImpl
// bit 1 : correspond to alias 1, etc.
// if the bit is set, the corresponding alias has been removed from parent
// and recorded under subselect.
private int _removedAliasFromParent = 0;
private BitSet _removedAliasFromParent = new BitSet(16);
/**
* Helper method to return the proper table alias for the given alias index.
@ -1496,7 +1497,7 @@ public class SelectImpl
return;
if (_parent._joins != null && !_parent._joins.isEmpty()) {
boolean removed = false;
if (_removedAliasFromParent > 0)
if (!_removedAliasFromParent.isEmpty())
removed = _parent._joins.joins().removeAll(pj.joins());
if (!removed)
pj.joins().removeAll(_parent._joins.joins());
@ -1914,7 +1915,7 @@ public class SelectImpl
if (alias != null) {
if (removeAliasFromParent) {
recordTableAlias(table, key, alias);
_removedAliasFromParent |= (1 << alias.intValue());
_removedAliasFromParent.set(alias.intValue());
}
return alias;
}