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

Merge "Issue #2899 - Improve error messages." into development

Browse source 
Former-commit-id: c54f77aa54 [formerly 65f7ef9290] [formerly 651b40e423] [formerly 651b40e423 [formerly fe56feaa74]] [formerly c54f77aa54 [formerly 65f7ef9290] [formerly 651b40e423] [formerly 651b40e423 [formerly fe56feaa74]] [formerly b9aae5b0f2 [formerly 651b40e423 [formerly fe56feaa74] [formerly b9aae5b0f2 [formerly f24a44ac9db6d1f1339aeaf3f0071656847b0d36]]]]]
Former-commit-id: b9aae5b0f2
Former-commit-id: 1dd73ccc21 [formerly a6497bb55d] [formerly addd8031b1] [formerly 73d984e9028d01a67be12f7876b27850b0aa39b0 [formerly 253abdca80717dff3140bda2f1a2de3138cf2346] [formerly addd8031b1 [formerly b5461e0ddb]]]
Former-commit-id: e7c0f1ee6836d0a0512087ab9de1c6971f401a8c [formerly a13593d31c7ddd509c49b38021ad9b5c0148a63c] [formerly 37738c66af [formerly 71598c15ac]]
Former-commit-id: 37738c66af
Former-commit-id: 69dfc13be9
This commit is contained in:
Nate Jensen 2014-04-01 08:46:25 -05:00 • committed by Gerrit Code Review
commit e054675682
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cave/com.raytheon.uf.viz.collaboration.comm/src/com/raytheon/uf/viz/collaboration/comm/provider/session/SharedDisplaySession.java
View file

@ -91,6 +91,7 @@ import com.raytheon.uf.viz.collaboration.comm.provider.user.VenueParticipant;
* Mar 06, 2014 2751 bclement added calls to getParticipantUserid()
* Mar 07, 2014 2848 bclement moved pubsub close logic to closePubSub()
* ensure that subscription is setup before joining room
* Mar 31, 2014 2899 mpduff Improve error messages.
*
* </pre>
*
@ -186,7 +187,7 @@ public class SharedDisplaySession extends VenueSession implements
* #sendObjectToVenue(java.lang.Object)
*/
@Override
public void sendObjectToVenue(Object obj){
public void sendObjectToVenue(Object obj) {
if (obj == null) {
return;
}
@ -300,15 +301,20 @@ public class SharedDisplaySession extends VenueSession implements
* configureVenue(java.lang.String)
*/
@Override
public void configureVenue()
throws CollaborationException {
public void configureVenue() throws CollaborationException {
try {
configureSubscription();
} catch (XMPPException e) {
closePubSub();
throw new CollaborationException(
"Unable to configure subscription", e);
int errorCode = e.getXMPPError().getCode();
String errorMsg = "Error configuring subscription";
if (errorCode == 404) {
errorMsg = "Shared display session no longer exists.";
}
throw new CollaborationException(errorMsg, e);
}
try {
super.configureVenue();
} catch (CollaborationException e) {
@ -675,7 +681,7 @@ public class SharedDisplaySession extends VenueSession implements
}
}
if (topicOwnershipGranted) {
try{
try {
revokeTopicOwnership(newLeaderId);
} catch (XMPPException e1) {
log.error(
@ -689,7 +695,7 @@ public class SharedDisplaySession extends VenueSession implements
log.warn("Problem releasing ownership of " + revokeTarget
+ ". " + e.getLocalizedMessage());
}
}
}
}
/*