Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
joram
joram
Commits
e453c161
Commit
e453c161
authored
Jan 12, 2021
by
Andre Freyssinet
Browse files
Code cleaning.
parent
c0fb60d8
Changes
1
Hide whitespace changes
Inline
Side-by-side
joram/joram/mom/core/src/main/java/org/objectweb/joram/mom/dest/Queue.java
View file @
e453c161
...
...
@@ -581,10 +581,10 @@ public class Queue extends Destination implements QueueMBean {
*/
protected
void
initialize
(
boolean
firstTime
)
throws
Exception
{
cleanWaitingRequest
(
System
.
currentTimeMillis
());
receiving
=
false
;
// averageLoadTask = new QueueAverageLoadTask(AgentServer.getTimer(), this);
// averageLoadTask = new QueueAverageLoadTask(AgentServer.getTimer(), this);
String
arrivalStateTxName
=
ARRIVAL_STATE_PREFIX
+
getId
().
toString
();
String
deliveryTableTxName
=
DELIVERY_TABLE_PREFIX
+
getId
().
toString
();
...
...
@@ -603,50 +603,50 @@ public class Queue extends Destination implements QueueMBean {
long
currentTime
=
System
.
currentTimeMillis
();
if
(
logmsg
.
isLoggable
(
BasicLevel
.
INFO
))
logmsg
.
log
(
BasicLevel
.
INFO
,
getName
()
+
", start retrieves messages"
);
for
(
int
index
=
0
;
index
<
messages
.
size
();
)
{
Message
persistedMsg
=
messages
.
get
(
index
);
if
(
logmsg
.
isLoggable
(
BasicLevel
.
INFO
))
logmsg
.
log
(
BasicLevel
.
INFO
,
getName
()
+
": retrieves message "
+
persistedMsg
.
getId
()
+
" -> "
+
persistedMsg
.
getDeliveryTime
());
if
(
logmsg
.
isLoggable
(
BasicLevel
.
INFO
))
logmsg
.
log
(
BasicLevel
.
INFO
,
getName
()
+
": retrieves message "
+
persistedMsg
.
getId
()
+
" -> "
+
persistedMsg
.
getDeliveryTime
());
QueueDelivery
queueDelivery
=
deliveryTable
.
get
(
persistedMsg
.
getId
());
if
(
queueDelivery
==
null
)
{
if
(
queueDelivery
==
null
)
{
if
(
persistedMsg
.
hasExpiration
())
nbExpirations
+=
1
;
if
(
persistedMsg
.
getDeliveryTime
()
>
currentTime
)
{
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
if
(
persistedMsg
.
getDeliveryTime
()
>
currentTime
)
{
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
DEBUG
,
getName
()
+
": schedule delayed message "
+
persistedMsg
.
getId
());
delayedMessageCount
+=
1
;
delayedMessageCount
+=
1
;
// TODO (AF): Be careful, this way of handling timed messages is not scalable. We should maintain an
// ordered list of timed messages, and set a timer for the first timeout (see Scheduler class).
AgentServer
.
getTimer
().
schedule
(
new
QueueDeliveryTimeTask
(
getId
(),
persistedMsg
,
false
),
new
Date
(
persistedMsg
.
getDeliveryTime
()));
AgentServer
.
getTimer
().
schedule
(
new
QueueDeliveryTimeTask
(
getId
(),
persistedMsg
,
false
),
new
Date
(
persistedMsg
.
getDeliveryTime
()));
// Remove message from the list of messages to deliver.
messages
.
remove
(
index
);
// Do not increment index.
continue
;
}
else
{
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
DEBUG
,
}
else
{
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
DEBUG
,
getName
()
+
": Adds message "
+
persistedMsg
.
getId
()
+
" in the list of messages to deliver."
);
}
}
else
{
}
}
else
{
// The message has been delivered before stop.
queueDelivery
.
setMessage
(
persistedMsg
);
if
(
isLocal
(
queueDelivery
.
getConsumerId
()))
{
queueDelivery
.
setMessage
(
persistedMsg
);
if
(
isLocal
(
queueDelivery
.
getConsumerId
()))
{
// The delivery is aborted.
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
DEBUG
,
" -> deny "
+
persistedMsg
.
getId
());
deliveryTable
.
remove
(
persistedMsg
.
getId
());
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
DEBUG
,
" -> deny "
+
persistedMsg
.
getId
());
deliveryTable
.
remove
(
persistedMsg
.
getId
());
if
(
persistedMsg
.
hasExpiration
())
nbExpirations
+=
1
;
}
else
{
}
else
{
// The delivery is always active, remove message from the list of messages to deliver.
messages
.
remove
(
index
);
// Do not increment index.
continue
;
}
}
}
}
index
+=
1
;
}
...
...
@@ -657,7 +657,7 @@ public class Queue extends Destination implements QueueMBean {
priority
=
messages
.
get
(
0
).
getPriority
();
}
}
if
(
logmsg
.
isLoggable
(
BasicLevel
.
INFO
))
logmsg
.
log
(
BasicLevel
.
INFO
,
getName
()
+
", end retrieves messages -> "
+
(
System
.
currentTimeMillis
()
-
currentTime
));
}
...
...
Write
Preview
Supports
Markdown
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