View | Details | Raw Unified | Return to bug 42272
Collapse All | Expand All

(-)java/src/org/apache/xindice/core/filer/BTree.java (+11 lines)
Lines 147-152 Link Here
147
        return false;
147
        return false;
148
    }
148
    }
149
149
150
    public synchronized boolean close() throws DBException {
151
        boolean closed = super.close();
152
        if (closed) {
153
            synchronized(cache) {
154
                cache.clear();
155
            }
156
        }
157
158
        return closed;
159
    }
160
150
    /**
161
    /**
151
     * addKey adds a Value to the BTree and associates a pointer with
162
     * addKey adds a Value to the BTree and associates a pointer with
152
     * it.  The pointer can be used for referencing any type of data, it
163
     * it.  The pointer can be used for referencing any type of data, it
(-)java/src/org/apache/xindice/core/filer/Paged.java (+5 lines)
Lines 654-659 Link Here
654
                        log.warn(descriptorsCount + " out of " + total + " files were not closed during close.");
654
                        log.warn(descriptorsCount + " out of " + total + " files were not closed during close.");
655
                    }
655
                    }
656
                }
656
                }
657
658
                // clear cache
659
                synchronized(pagesLock) {
660
                    pages.clear();
661
                }
657
            } catch (Exception e) {
662
            } catch (Exception e) {
658
                // Failed to close, leave open
663
                // Failed to close, leave open
659
                opened = true;
664
                opened = true;
(-)java/src/org/apache/xindice/tools/DatabaseRebuild.java (-1 / +1 lines)
Lines 382-388 Link Here
382
                Value v = filer.getValue(pointer);
382
                Value v = filer.getValue(pointer);
383
                newFiler.writeRecord(new Key(value), v);
383
                newFiler.writeRecord(new Key(value), v);
384
            } catch (Exception e) {
384
            } catch (Exception e) {
385
                e.printStackTrace();
385
                log.error(e);
386
            }
386
            }
387
387
388
            return true;
388
            return true;
(-)bin/xindice_rebuild.bat (-3 / +6 lines)
Lines 80-87 Link Here
80
)
80
)
81
81
82
:checkdir
82
:checkdir
83
echo Checking locak backup %_LOCAL_BACKUP%
83
echo Checking local backup %_LOCAL_BACKUP%
84
if exist %_LOCAL_BACKUP% goto backup-error     
84
if exist %_LOCAL_BACKUP% goto backup-error      
85
xcopy /E %2 %LOCAL_BACKUP%
85
xcopy /E %2 %LOCAL_BACKUP%
86
86
87
87
Lines 94-102 Link Here
94
goto LOOP
94
goto LOOP
95
:DONE
95
:DONE
96
96
97
if not exist %_XINDICE_HOME%\logs mkdir %_XINDICE_HOME%\logs
98
99
97
:: ----- Start Command Line Tool -----------------------------------------------
100
:: ----- Start Command Line Tool -----------------------------------------------
98
101
99
%_JAVACMD% -Xms16m -Xmx128m -Dorg.apache.commons.logging.Log=%_LOGGER% -Dorg.apache.commons.logging.simplelog.defaultlog=%_LOGLEVEL% -cp %LOCALCLASSPATH% org.apache.xindice.tools.DatabaseRebuild %_CL% 
102
%_JAVACMD% -Xms16m -Xmx128m -Dorg.apache.commons.logging.Log=%_LOGGER% -Dorg.apache.commons.logging.simplelog.defaultlog=%_LOGLEVEL% -cp %LOCALCLASSPATH% org.apache.xindice.tools.DatabaseRebuild %_CL% 2>>"%_XINDICE_HOME%"\logs\rebuild.log
100
103
101
104
102
goto end
105
goto end

Return to bug 42272