xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2937 Fixed from user in xmpp message." into development

Browse source 
Former-commit-id: b317a39484 [formerly 5ded9b0bae] [formerly 9aa730cfd8] [formerly b317a39484 [formerly 5ded9b0bae] [formerly 9aa730cfd8] [formerly 85c5f8f64f [formerly 9aa730cfd8 [formerly 9fc178c2b8cfcbafbe9848076998d29af0f55912]]]]
Former-commit-id: 85c5f8f64f
Former-commit-id: 33b59e6d7d [formerly 0e4305296c] [formerly 2cd90fa496e8fa22a82e7f64f7b9798c3b30c3fd [formerly 4c6151f4cb]]
Former-commit-id: b8ad16f05d213298f869051e3944d19eb8f38945 [formerly 390482aeba]
Former-commit-id: 6c20b25f21
This commit is contained in:
Nate Jensen 2014-04-14 15:33:04 -05:00 • committed by Gerrit Code Review
commit bcedd3f3d8
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
javaUtilities/com.raytheon.openfire.plugin.detailedfeedlog/java/com/raytheon/openfire/plugin/detailedfeedlog/listener/DetailedFeedLogEventListener.java
View file

@ -52,6 +52,7 @@ import com.raytheon.openfire.plugin.detailedfeedlog.LogEntry;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Jul 25, 2012 mnash Initial creation * Jul 25, 2012 mnash Initial creation
* Apr 07, 2014 2937 bgonzale Handle errors processing room events. * Apr 07, 2014 2937 bgonzale Handle errors processing room events.
* Fixed message from user.
* *
* </pre> * </pre>
* *
@ -98,7 +99,7 @@ public class DetailedFeedLogEventListener implements MUCEventListener {
// set all the necessary values in the message to be // set all the necessary values in the message to be
// sent out // sent out
message.setTo(user); message.setTo(user);
message.setFrom(roomJID + "/" + nickname); message.setFrom(roomJID + "/" + sendUser);
String body = HISTORY_START String body = HISTORY_START
+ entry.getDate().getTime() + "|" + entry.getDate().getTime() + "|"
+ sendUser + "|" + entry.getSite() + "|" + sendUser + "|" + entry.getSite() + "|"