Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
joram
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
joram
joram
Commits
2f578537
Commit
2f578537
authored
Jan 12, 2021
by
Andre Freyssinet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix JMQ-215.
parent
8ed07f7e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
2 deletions
+18
-2
joram/a3/rt/src/main/java/fr/dyade/aaa/ext/NGTransaction.java
...m/a3/rt/src/main/java/fr/dyade/aaa/ext/NGTransaction.java
+6
-1
joram/a3/rt/src/main/java/fr/dyade/aaa/util/DBTransaction.java
.../a3/rt/src/main/java/fr/dyade/aaa/util/DBTransaction.java
+7
-1
joram/a3/rt/src/main/java/fr/dyade/aaa/util/NTransaction.java
...m/a3/rt/src/main/java/fr/dyade/aaa/util/NTransaction.java
+5
-0
No files found.
joram/a3/rt/src/main/java/fr/dyade/aaa/ext/NGTransaction.java
View file @
2f578537
/*
* Copyright (C) 2009 - 20
19
ScalAgent Distributed Technologies
* Copyright (C) 2009 - 20
21
ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
...
...
@@ -385,6 +385,11 @@ public final class NGTransaction extends AbstractTransaction implements NGTransa
else
op
=
Operation
.
alloc
(
Operation
.
SAVE
,
dirName
,
name
,
buf
);
Operation
old
=
(
Operation
)
log
.
put
(
key
,
op
);
// Bug fix: JMQ-215
if
(
first
&&
(
old
!=
null
)
&&
(
old
.
type
==
Operation
.
DELETE
))
op
.
type
=
Operation
.
SAVE
;
if
(
copy
)
{
if
((
old
!=
null
)
&&
(
old
.
type
==
Operation
.
SAVE
)
&&
...
...
joram/a3/rt/src/main/java/fr/dyade/aaa/util/DBTransaction.java
View file @
2f578537
/*
* Copyright (C) 2006 - 202
0
ScalAgent Distributed Technologies
* Copyright (C) 2006 - 202
1
ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
...
...
@@ -365,6 +365,11 @@ public abstract class DBTransaction extends AbstractTransaction implements DBTra
else
op
=
DBOperation
.
alloc
(
Operation
.
SAVE
,
fname
,
buf
);
DBOperation
old
=
(
DBOperation
)
log
.
put
(
fname
,
op
);
// Bug fix: JMQ-215
if
(
first
&&
(
old
!=
null
)
&&
(
old
.
type
==
Operation
.
DELETE
))
op
.
type
=
Operation
.
SAVE
;
if
(
copy
)
{
if
((
old
!=
null
)
&&
(
old
.
type
==
DBOperation
.
SAVE
)
&&
...
...
@@ -514,6 +519,7 @@ public abstract class DBTransaction extends AbstractTransaction implements DBTra
lastTry
=
System
.
currentTimeMillis
();
connectDB
();
createPreparedStatement
();
logmon
.
log
(
BasicLevel
.
DEBUG
,
"DBTransaction, commit: DB connected"
);
}
catch
(
IOException
exc
)
{
logmon
.
log
(
BasicLevel
.
INFO
,
"DBTransaction, commit: cannot reconnect"
+
exc
.
getMessage
());
}
...
...
joram/a3/rt/src/main/java/fr/dyade/aaa/util/NTransaction.java
View file @
2f578537
...
...
@@ -490,6 +490,11 @@ public final class NTransaction extends AbstractTransaction implements NTransact
else
op
=
Operation
.
alloc
(
Operation
.
SAVE
,
dirName
,
name
,
buf
);
Operation
old
=
(
Operation
)
log
.
put
(
key
,
op
);
// Bug fix: JMQ-215
if
(
first
&&
(
old
!=
null
)
&&
(
old
.
type
==
Operation
.
DELETE
))
op
.
type
=
Operation
.
SAVE
;
if
(
copy
)
{
if
((
old
!=
null
)
&&
(
old
.
type
==
Operation
.
SAVE
)
&&
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment