diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/persistent/AbstractStoringPageFile.java')
-rw-r--r-- | src/de/lmu/ifi/dbs/elki/persistent/AbstractStoringPageFile.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/persistent/AbstractStoringPageFile.java b/src/de/lmu/ifi/dbs/elki/persistent/AbstractStoringPageFile.java index bb4e915d..7151e6dd 100644 --- a/src/de/lmu/ifi/dbs/elki/persistent/AbstractStoringPageFile.java +++ b/src/de/lmu/ifi/dbs/elki/persistent/AbstractStoringPageFile.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.persistent; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -67,11 +67,11 @@ public abstract class AbstractStoringPageFile<P extends Page> extends AbstractPa * @param page the page to set the id */ @Override - public Integer setPageID(P page) { - Integer pageID = page.getPageID(); - if(pageID == null) { + public int setPageID(P page) { + int pageID = page.getPageID(); + if(pageID == -1) { pageID = getNextEmptyPageID(); - if(pageID == null) { + if(pageID == -1) { pageID = nextPageID++; } page.setPageID(pageID); @@ -95,12 +95,12 @@ public abstract class AbstractStoringPageFile<P extends Page> extends AbstractPa * * @return the next empty page id */ - private Integer getNextEmptyPageID() { + private int getNextEmptyPageID() { if(!emptyPages.empty()) { return emptyPages.pop(); } else { - return null; + return -1; } } |