Skip to content
GitLab
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
a67c8a2a
Commit
a67c8a2a
authored
Oct 19, 2010
by
afreyssin
Browse files
Bug fix: no longer have a NPE when a bridge client use receiveNoWait JMS method.
parent
21e2f135
Changes
2
Hide whitespace changes
Inline
Side-by-side
joram/joram/mom/extensions/jmsbridge/src/main/java/org/objectweb/joram/mom/dest/jmsbridge/JMSBridgeModule.java
View file @
a67c8a2a
...
...
@@ -298,13 +298,19 @@ public class JMSBridgeModule implements javax.jms.ExceptionListener,
logger
.
log
(
BasicLevel
.
WARN
,
"Exception:: XA can't start resource : "
+
consumerRes
,
e
);
}
}
org
.
objectweb
.
joram
.
client
.
jms
.
Message
clientMessage
=
org
.
objectweb
.
joram
.
client
.
jms
.
Message
.
convertJMSMessage
(
consumer
.
receiveNoWait
());
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
DEBUG
,
"receiveNoWait: clientMessage="
+
clientMessage
);
javax
.
jms
.
Message
msg
=
consumer
.
receiveNoWait
();
if
(
msg
!=
null
)
{
org
.
objectweb
.
joram
.
client
.
jms
.
Message
clientMessage
=
org
.
objectweb
.
joram
.
client
.
jms
.
Message
.
convertJMSMessage
(
msg
);
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
DEBUG
,
"receiveNoWait: clientMessage="
+
clientMessage
);
momMessage
=
clientMessage
.
getMomMsg
();
momMessage
=
clientMessage
.
getMomMsg
();
}
else
{
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
DEBUG
,
"receiveNoWait: no message available"
);
}
if
(
isXA
)
{
try
{
consumerRes
.
end
(
xid
,
XAResource
.
TMSUCCESS
);
...
...
joram/joram/mom/extensions/jmsbridge/src/main/java/org/objectweb/joram/mom/dest/jmsbridge/JMSBridgeQueueImpl.java
View file @
a67c8a2a
...
...
@@ -209,7 +209,8 @@ public class JMSBridgeQueueImpl extends QueueImpl {
message
=
null
;
QueueMsgReply
reply
=
new
QueueMsgReply
(
not
);
reply
.
addMessage
(
message
);
if
(
message
!=
null
)
reply
.
addMessage
(
message
);
forward
(
from
,
reply
);
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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