Code improvements.

This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions

View File

@ -110,22 +110,15 @@ public class BitSetIDFactory extends IdFactory
_freeIds.set(newID);
_freeIdCount.decrementAndGet();
int nextFree = _freeIds.nextClearBit(newID);
final int nextFree = _freeIds.nextClearBit(newID) < 0 ? _freeIds.nextClearBit(0) : _freeIds.nextClearBit(newID);
if (nextFree < 0)
{
nextFree = _freeIds.nextClearBit(0);
}
if (nextFree < 0)
{
if (_freeIds.size() < FREE_OBJECT_ID_SIZE)
{
increaseBitSetCapacity();
}
else
if (_freeIds.size() >= FREE_OBJECT_ID_SIZE)
{
throw new NullPointerException("Ran out of valid Id's.");
}
increaseBitSetCapacity();
}
_nextFreeId.set(nextFree);

View File

@ -88,11 +88,7 @@ public class CompactionIDFactory extends IdFactory
}
}
int hole = id - _curOID;
if (hole > (N - idx))
{
hole = N - idx;
}
final int hole = (id - _curOID) > (N - idx) ? N - idx : id - _curOID;
for (int i = 1; i <= hole; i++)
{
id = tmp_obj_ids[N - i];

View File

@ -101,11 +101,7 @@ public class StackIDFactory extends IdFactory
}
// int hole = id - _curOID;
int hole = id - _tempOID;
if (hole > (N - idx))
{
hole = N - idx;
}
final int hole = (id - _tempOID) > (N - idx) ? N - idx : id - _tempOID;
for (int i = 1; i <= hole; i++)
{
// log.info("Free ID added " + (_tempOID));