Skip to content

Stop shadowing Task._stop and Task._lastException (CodeQL java/field-masks-super-field) #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vharseko wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Stop shadowing Task._stop and Task._lastException (CodeQL java/field-masks-super-field) #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d127744
Stop shadowing Task._stop and Task._lastException (CodeQL java/field-…
vharseko Jul 8, 2026
183d5c7
Use short-circuit && for stop checks in StreamSaver (CodeQL java/non-…
vharseko Jul 8, 2026
85fbaba
Merge branch 'master' into features/codeql-field-masks-super
vharseko Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions persistit/core/src/main/java/com/persistit/StreamLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Portions Copyrighted 2026 3A Systems, LLC
*/

package com.persistit;
Expand Down Expand Up @@ -50,8 +51,6 @@ public class StreamLoader extends Task {
protected Tree _lastTree;
protected int _dataRecordCount = 0;
protected int _otherRecordCount = 0;
protected boolean _stop;
protected Exception _lastException;

protected TreeSelector _treeSelector;
protected boolean _createMissingVolumes;
Expand Down
10 changes: 4 additions & 6 deletions persistit/core/src/main/java/com/persistit/StreamSaver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,6 @@ public class StreamSaver extends Task {
protected long _dataRecordCount = 0;
protected long _otherRecordCount = 0;
protected int _cycleCount = DEFAULT_CYCLE_COUNT;
protected boolean _stop;
protected Exception _lastException;
protected int _recordCount;
protected TreeSelector _treeSelector;

Expand Down Expand Up @@ -244,7 +242,7 @@ public void setCycleCount(final int count) {
*/
public void close() throws IOException {
writeTimestamp();
if (!_stop && _lastException == null)
if (!_stop.get() && _lastException == null)
_dos.writeChar(RECORD_TYPE_COMPLETION);
_lastTree = null;
_lastVolume = null;
Expand Down Expand Up @@ -456,7 +454,7 @@ public void save(final Exchange exchange, final KeyFilter filter) throws Persist
}
final Key key = exchange.getKey();
key.clear().append(Key.BEFORE);
while (exchange.traverse(Key.GT, filter, Integer.MAX_VALUE) & !_stop) {
while (exchange.traverse(Key.GT, filter, Integer.MAX_VALUE) && !_stop.get()) {
writeData(exchange);
}
writeRecordCount(_dataRecordCount, _otherRecordCount);
Expand Down Expand Up @@ -497,7 +495,7 @@ public void saveTrees(final String volumeName, final String[] selectedTreeNames)
public void saveTrees(final Volume volume, final String[] selectedTreeNames) throws PersistitException, IOException {
final String[] treeNames = volume.getTreeNames();
writeComment("Volume " + volume.getPath());
for (int index = 0; index < treeNames.length & !_stop; index++) {
for (int index = 0; index < treeNames.length && !_stop.get(); index++) {
boolean selected = true;
if (selectedTreeNames != null) {
for (int index2 = 0; selected && index2 < selectedTreeNames.length; index2++) {
Expand Down Expand Up @@ -567,7 +565,7 @@ public void saveTrees(final TreeSelector treeSelector) throws PersistitException
public void saveAll() throws PersistitException, IOException {

for (final Volume volume : _persistit.getVolumes()) {
if (_stop) {
if (_stop.get()) {
break;
}
saveTrees(volume, null);
Expand Down
Loading